From 9acc47cc76d0ae855a55047d5a2e4f2999194053 Mon Sep 17 00:00:00 2001
From: Gustavo <gustavobenn@hotmail.com>
Date: Sat, 31 Mar 2018 01:05:46 -0300
Subject: [PATCH] fix #60

---
 script.moonlight/addon.py         |  2 --
 script.moonlight/lib/moonlight.py | 15 +++++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/script.moonlight/addon.py b/script.moonlight/addon.py
index 2ad7b34..9efa84a 100644
--- a/script.moonlight/addon.py
+++ b/script.moonlight/addon.py
@@ -18,8 +18,6 @@ addon = xbmcaddon.Addon()
 addon_base_path = xbmc.translatePath(addon.getAddonInfo('profile')).decode('utf-8')
 xbmcplugin.setContent(addon_handle, "files")
 
-os.environ['LD_LIBRARY_PATH'] = "/usr/lib:/lib:" + addon.getAddonInfo("path") + "/lib"
-
 def build_url(query):
     return base_url + "?" + urllib.urlencode(query)
 
diff --git a/script.moonlight/lib/moonlight.py b/script.moonlight/lib/moonlight.py
index 87065fc..d2c825a 100644
--- a/script.moonlight/lib/moonlight.py
+++ b/script.moonlight/lib/moonlight.py
@@ -34,7 +34,7 @@ class SERVER_DATA(ctypes.Structure):
                 ("gsVersion", ctypes.c_char_p),
                 ("modes", DISPLAY_MODE),
                 ("serverInfo", SERVER_INFORMATION)]
-                
+
 class APP_LIST(ctypes.Structure):
     pass
 
@@ -46,10 +46,17 @@ class _HTTP_DATA(ctypes.Structure):
     _fields_ = [("memory", ctypes.POINTER(ctypes.c_ubyte)),
                 ("size", ctypes.c_size_t)]
 
+def findlib(name):
+    libdirs = os.environ['LD_LIBRARY_PATH'].split(':')
+    for dir in libdirs:
+        for file in os.listdir(dir):
+            if file.find(name) != -1:
+                return os.path.join(dir, file)
+
 class LibGameStream:
     def __init__(self, libpath = ""):
-        self.commonlib = ctypes.cdll.LoadLibrary(os.path.join(libpath, "libmoonlight-common.so.2"))
-        self.gslib = ctypes.cdll.LoadLibrary(os.path.join(libpath, "libgamestream.so.2"))
+        self.commonlib = ctypes.cdll.LoadLibrary(findlib("libmoonlight-common.so"))
+        self.gslib = ctypes.cdll.LoadLibrary(findlib("libgamestream.so"))
         self.connected = False
         self.address = ""
         self.key_dir = ""
@@ -101,7 +108,7 @@ class LibGameStream:
         return lst
 
     def poster(self, appId, toFolder):
-        unique_id = ""        
+        unique_id = ""
         with open(os.path.join(self.key_dir, "uniqueid.dat"), "r") as f:
             unique_id = f.read()