Merge pull request #718 from croneter/fix-unresponsive
Fix PKC crashing on resetting the database
This commit is contained in:
commit
b31a2c6b35
1 changed files with 6 additions and 1 deletions
|
@ -126,7 +126,10 @@ class Sync(backgroundthread.KillableThread):
|
||||||
utils.ERROR(txt='sync.py crashed', notify=True)
|
utils.ERROR(txt='sync.py crashed', notify=True)
|
||||||
raise
|
raise
|
||||||
finally:
|
finally:
|
||||||
|
try:
|
||||||
app.APP.deregister_thread(self)
|
app.APP.deregister_thread(self)
|
||||||
|
except ValueError:
|
||||||
|
pass
|
||||||
LOG.info("###===--- Sync Thread Stopped ---===###")
|
LOG.info("###===--- Sync Thread Stopped ---===###")
|
||||||
|
|
||||||
def _run_internal(self):
|
def _run_internal(self):
|
||||||
|
@ -146,6 +149,8 @@ class Sync(backgroundthread.KillableThread):
|
||||||
v.MIN_DB_VERSION):
|
v.MIN_DB_VERSION):
|
||||||
LOG.warn("Db version out of date: %s minimum version "
|
LOG.warn("Db version out of date: %s minimum version "
|
||||||
"required: %s", current_version, v.MIN_DB_VERSION)
|
"required: %s", current_version, v.MIN_DB_VERSION)
|
||||||
|
# In order to not wait for this thread to suspend
|
||||||
|
app.APP.deregister_thread(self)
|
||||||
# DB out of date. Proceed to recreate?
|
# DB out of date. Proceed to recreate?
|
||||||
if not utils.yesno_dialog(utils.lang(29999),
|
if not utils.yesno_dialog(utils.lang(29999),
|
||||||
utils.lang(39401)):
|
utils.lang(39401)):
|
||||||
|
|
Loading…
Reference in a new issue