Merge branch 'develop'

zyantific · Jun 27, 2018 · 9f4dbf6 · 9f4dbf6
2 parents a25f9ed + f0349a3
commit 9f4dbf6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/plugins/idaskins/idafontconfig.py b/plugins/idaskins/idafontconfig.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 
-import os
+import os, sys
 
 import idaapi
 from PyQt5.QtGui import QFontDatabase
@@ -25,8 +25,8 @@ def family(self):
             'Name',
             self._key,
             'Consolas'
-            if os.name == 'nt' else
-            QFontDatabase.systemFont(QFontDatabase.FixedFont).family()
+            if os.name == 'nt' else 
+            QFontDatabase.systemFont(QFontDatabase.FixedFont).family().encode()    
         )
 
     @property