fix schema not being modified on backup import

This commit is contained in:
Damien Elmes 2019-02-14 15:22:57 +10:00
parent 4acebfdf52
commit 8e944c6a02

View file

@ -380,7 +380,6 @@ def setupApkgImport(mw, importer):
if not full:
# adding
return True
backup = re.match("backup-.*\\.apkg", base)
if not mw.restoringBackup and not askUser(_("""\
This will delete your existing collection and replace it with the data in \
the file you're importing. Are you sure?"""), msgfunc=QMessageBox.warning,
@ -389,7 +388,7 @@ the file you're importing. Are you sure?"""), msgfunc=QMessageBox.warning,
# schedule replacement; don't do it immediately as we may have been
# called as part of the startup routine
mw.progress.timer(
100, lambda mw=mw, f=importer.file: replaceWithApkg(mw, f, backup), False)
100, lambda mw=mw, f=importer.file: replaceWithApkg(mw, f, mw.restoringBackup), False)
def replaceWithApkg(mw, file, backup):
mw.unloadCollection(lambda: _replaceWithApkg(mw, file, backup))