Commit 8b57713a authored by Jack Jansen's avatar Jack Jansen

Hide the ProgressBar before raising KeyboardInterrupt. Not doing so resulted in a hang on Carbon.

parent 50fc5cb7
...@@ -217,6 +217,8 @@ screenbounds = screenbounds[0]+4, screenbounds[1]+4, \ ...@@ -217,6 +217,8 @@ screenbounds = screenbounds[0]+4, screenbounds[1]+4, \
class ProgressBar: class ProgressBar:
def __init__(self, title="Working...", maxval=100, label="", id=263): def __init__(self, title="Working...", maxval=100, label="", id=263):
self.w = None
self.d = None
self.maxval = maxval self.maxval = maxval
self.curval = -1 self.curval = -1
self.d = GetNewDialog(id, -1) self.d = GetNewDialog(id, -1)
...@@ -229,8 +231,9 @@ class ProgressBar: ...@@ -229,8 +231,9 @@ class ProgressBar:
self.d.DrawDialog() self.d.DrawDialog()
def __del__( self ): def __del__( self ):
self.w.BringToFront() if self.w:
self.w.HideWindow() self.w.BringToFront()
self.w.HideWindow()
del self.w del self.w
del self.d del self.d
...@@ -268,6 +271,9 @@ class ProgressBar: ...@@ -268,6 +271,9 @@ class ProgressBar:
if Dlg.IsDialogEvent(ev): if Dlg.IsDialogEvent(ev):
ds = Dlg.DialogSelect(ev) ds = Dlg.DialogSelect(ev)
if ds[0] and ds[1] == self.d and ds[-1] == 1: if ds[0] and ds[1] == self.d and ds[-1] == 1:
self.w.HideWindow()
self.w = None
self.d = None
raise KeyboardInterrupt, ev raise KeyboardInterrupt, ev
else: else:
if part == 4: # inDrag if part == 4: # inDrag
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment