tentative fix for NoneType blockdir error in BDM.py

etotheipi · Apr 29, 2014 · df60506 · df60506
1 parent b98d805
commit df60506
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/armoryengine/ArmoryUtils.py b/armoryengine/ArmoryUtils.py
@@ -58,7 +58,6 @@
 
 
 indent = ' '*3
-haveGUI = [False, None]
 
 parser = optparse.OptionParser(usage="%prog [options]\n")
 parser.add_option("--settings",        dest="settingsPath",default='DEFAULT', type="str",          help="load Armory with a specific settings file")

diff --git a/armoryengine/BDM.py b/armoryengine/BDM.py
@@ -904,17 +904,12 @@ def __startLoadBlockchain(self):
       blockdir = blkdir
       leveldbdir = self.ldbdir
 
-      if getattr(sys, 'frozen', False):
+      if isinstance(ARMORY_HOME_DIR, unicode):
          armory_homedir = ARMORY_HOME_DIR.encode('utf8')
+      if isinstance(blkdir, unicode):
          blockdir = blkdir.encode('utf8')
+      if isinstance(self.ldbdir, unicode):
          leveldbdir = self.ldbdir.encode('utf8')
-      elif OS_WINDOWS:
-         if isinstance(ARMORY_HOME_DIR, unicode):
-            armory_homedir = ARMORY_HOME_DIR.encode('utf8')
-         if isinstance(blkdir, unicode):
-            blockdir = blkdir.encode('utf8')
-         if isinstance(self.ldbdir, unicode):
-            leveldbdir = self.ldbdir.encode('utf8')
 
       self.bdm.SetDatabaseModes(ARMORY_DB_BARE, DB_PRUNE_NONE);
       self.bdm.SetHomeDirLocation(armory_homedir)