Merge branch 'develop'

zyantific · Jun 26, 2018 · a25f9ed · a25f9ed
2 parents 634f2ae + 4961cff
commit a25f9ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/plugins/idaskins/plugin.py b/plugins/idaskins/plugin.py
@@ -124,8 +124,8 @@ def apply_stylesheet(self, abs_theme_dir, manifest):
 
     def apply_stylesheet_from_settings(self):
         theme_dir = self._settings.selected_theme_dir
-        abs_theme_dir = os.path.join(THEMES_DIR, theme_dir)
         if theme_dir:
+            abs_theme_dir = os.path.join(THEMES_DIR, theme_dir)
             try:
                 manifest = ThemeManifest(open(os.path.join(
                     abs_theme_dir, 'manifest.json'

diff --git a/plugins/idaskins/settings.py b/plugins/idaskins/settings.py
@@ -12,7 +12,8 @@ def __init__(self):
 
     @property
     def selected_theme_dir(self):
-        return self._settings.value(SELECTED_THEME_DIR_KEY, None).encode()
+        theme_dir = self._settings.value(SELECTED_THEME_DIR_KEY, None)
+        return None if theme_dir is None else theme_dir.encode()
 
     @selected_theme_dir.setter
     def selected_theme_dir(self, v):