Fixed marriage problem and startup dialog

svn: r1515
This commit is contained in:
Don Allingham
2003-05-12 19:39:49 +00:00
parent 3058db9d18
commit ec119ab64a
8 changed files with 219 additions and 46 deletions

View File

@ -113,6 +113,7 @@ def importData(database, filename, callback):
return 0
xml_file.close()
del parser
# Rename media files if they were conflicting with existing ones
ObjectMap = database.getObjectMap()
@ -218,6 +219,7 @@ def loadData(database, filename, callback=None):
return 0
xml_file.close()
del parser
return 1
#-------------------------------------------------------------------------