From 1462e07fa5c0e4cce1a23e0c4e98d46ff3953235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Odd=20Str=C3=A5b=C3=B8?= <oddstr13@openshell.no>
Date: Sun, 10 Oct 2021 15:05:22 +0200
Subject: [PATCH] Apply suggestions from code review

---
 jellyfin_kodi/dialogs/context.py    | 4 +++-
 jellyfin_kodi/entrypoint/default.py | 2 +-
 jellyfin_kodi/helper/loghandler.py  | 4 +++-
 jellyfin_kodi/jellyfin/ws_client.py | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jellyfin_kodi/dialogs/context.py b/jellyfin_kodi/dialogs/context.py
index 834a09a0..d2b51e7a 100644
--- a/jellyfin_kodi/dialogs/context.py
+++ b/jellyfin_kodi/dialogs/context.py
@@ -35,7 +35,9 @@ class ContextMenu(xbmcgui.WindowXMLDialog):
         xbmcgui.WindowXMLDialog.__init__(self, *args, **kwargs)
 
     def set_options(self, options=None):
-        self._options = [] if options is None else options
+        self._options = options
+        if options is None:
+            self._options = []
 
     def is_selected(self):
         return bool(self.selected_option)
diff --git a/jellyfin_kodi/entrypoint/default.py b/jellyfin_kodi/entrypoint/default.py
index 0d2ac6f3..d2b400a4 100644
--- a/jellyfin_kodi/entrypoint/default.py
+++ b/jellyfin_kodi/entrypoint/default.py
@@ -267,7 +267,7 @@ def browse(media, view_id=None, folder=None, server_id=None, api_client=None):
 
         monitor = xbmc.Monitor()
 
-        for _ in range(300):
+        for _i in range(300):
             if window('jellyfin_online.bool'):
                 break
             elif monitor.waitForAbort(0.1):
diff --git a/jellyfin_kodi/helper/loghandler.py b/jellyfin_kodi/helper/loghandler.py
index 9d1cd07f..01ef7a67 100644
--- a/jellyfin_kodi/helper/loghandler.py
+++ b/jellyfin_kodi/helper/loghandler.py
@@ -51,7 +51,9 @@ class LogHandler(logging.StreamHandler):
 
         self.mask_info = settings('maskInfo.bool')
 
-        self.level = xbmc.LOGINFO if kodi_version() > 18 else xbmc.LOGNOTICE
+        self.level = xbmc.LOGNOTICE
+        if kodi_version() > 18:
+            self.level = xbmc.LOGINFO
 
     def emit(self, record):
 
diff --git a/jellyfin_kodi/jellyfin/ws_client.py b/jellyfin_kodi/jellyfin/ws_client.py
index 3d8d0dc2..30f4c831 100644
--- a/jellyfin_kodi/jellyfin/ws_client.py
+++ b/jellyfin_kodi/jellyfin/ws_client.py
@@ -62,7 +62,7 @@ class WSClient(threading.Thread):
 
             self.wsc.run_forever(ping_interval=10)
 
-            if monitor.waitForAbort(5):
+            if not self.stop and monitor.waitForAbort(5):
                 break
 
         LOG.info("---<[ websocket ]")