This commit is contained in:
Kovid Goyal 2011-04-22 08:32:58 -06:00
parent e578864c94
commit c2d78fefc0

View File

@ -178,7 +178,6 @@ class ApplyDialog(QDialog):
if self.canceled: if self.canceled:
return return
if self.current_idx >= len(self.id_map): if self.current_idx >= len(self.id_map):
self.timer.stop()
self.finalize() self.finalize()
return return
@ -209,8 +208,13 @@ class ApplyDialog(QDialog):
QDialog.reject(self) QDialog.reject(self)
def finalize(self): def finalize(self):
self.timer.stop()
if self.canceled: if self.canceled:
return return
# Prevent queued timer events from having any effect
self.canceled = True
if self.failures: if self.failures:
msg = [] msg = []
db = self.gui.current_db db = self.gui.current_db
@ -233,6 +237,7 @@ class ApplyDialog(QDialog):
self.ids, cr) self.ids, cr)
if self.gui.cover_flow: if self.gui.cover_flow:
self.gui.cover_flow.dataChanged() self.gui.cover_flow.dataChanged()
self.accept() self.accept()
_amd = None _amd = None