Merge branch 'master' into py3EFFS

2018-07-11 02:23:01 -04:00
parent 7a078f433a 89efa9cbf9
commit c0e9878982
6 changed files with 12 additions and 5 deletions
--- a/service/character.py
+++ b/service/character.py
@@ -51,9 +51,6 @@ class CharacterImportThread(threading.Thread):
        self.callback = callback

    def run(self):
-        wx.CallAfter(self.callback)
-        # todo: Fix character import (don't need CCP SML anymore, only support evemon?)
-        return
        paths = self.paths
        sCharacter = Character.getInstance()
        all5_character = es_Character("All 5", 5)