From 12930afa9eadf25462710fa173be2d65de5cbaff Mon Sep 17 00:00:00 2001
From: Shaun <shaun@bluebit.com.au>
Date: Wed, 3 Jan 2018 18:59:33 +1100
Subject: [PATCH] fix a unicode bug, comparing unicode and none unicode strings
 has issues

---
 resources/lib/downloadutils.py  | 2 +-
 resources/lib/item_functions.py | 1 -
 resources/lib/server_detect.py  | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lib/downloadutils.py b/resources/lib/downloadutils.py
index 0f73d31..cdae8df 100644
--- a/resources/lib/downloadutils.py
+++ b/resources/lib/downloadutils.py
@@ -176,7 +176,7 @@ class DownloadUtils():
         userid = ""
         secure = False
         for user in result:
-            if (user.get("Name") == userName):
+            if (user.get("Name") == unicode(userName, "utf-8")):
                 userid = user.get("Id")
                 log.debug("Username Found: {0}", user.get("Name"))
                 if (user.get("HasPassword") == True):
diff --git a/resources/lib/item_functions.py b/resources/lib/item_functions.py
index c02d449..29ea527 100644
--- a/resources/lib/item_functions.py
+++ b/resources/lib/item_functions.py
@@ -490,7 +490,6 @@ def get_next_episode(item):
     parendId = item.get("ParentId", "na")
     item_index = item.get("IndexNumber", -1)
 
-
     if parendId == "na":
         log.debug("No parent id, can not get next")
         return None
diff --git a/resources/lib/server_detect.py b/resources/lib/server_detect.py
index e0ee992..a3fbf23 100644
--- a/resources/lib/server_detect.py
+++ b/resources/lib/server_detect.py
@@ -107,6 +107,7 @@ def checkServer(force=False, change_user=False, notify=False):
 
     # we need to change the user
     current_username = settings.getSetting("username")
+    current_username = unicode(current_username, "utf-8")
 
     # if asked or we have no current user then show user selection screen
     if change_user or len(current_username) == 0: