Merge branch 'master' into test-3

2018-03-01 00:40:40 -05:00
parent 3f3a82ca6c 3411dcfd91
commit 963353a1dc
3 changed files with 14 additions and 7 deletions
--- a/service/character.py
+++ b/service/character.py
@@ -66,7 +66,7 @@ class CharacterImportThread(threading.Thread):
                with open(path, mode='r') as charFile:
                    sheet = ParseXML(charFile)
                    char = sCharacter.new(sheet.name + " (imported)")
-                    sCharacter.apiUpdateCharSheet(char.ID, sheet.skills)
+                    sCharacter.apiUpdateCharSheet(char.ID, sheet.skills, 0)
            except:
                # if it's not api XML data, try this
                # this is a horrible logic flow, but whatever