From 5d22f57fd0fdd0b705f4976af277a93ac8937b4b Mon Sep 17 00:00:00 2001 From: khayber Date: Thu, 14 Sep 2006 02:46:17 +0000 Subject: [PATCH] Last minute 'Oops!' - application didn't exit because of TimeoutBlocker toplevel_ref() Fixed Home Page --- AppInfo.xml | 2 +- ripper.py | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/AppInfo.xml b/AppInfo.xml index bdd0516..6977af8 100644 --- a/AppInfo.xml +++ b/AppInfo.xml @@ -14,7 +14,7 @@ Ken Hayber 006 (13-Sep-2006) GNU General Public License - http://www.hayber.us/wiki/index.php/ROX/Ripper + http://www.hayber.us/rox/Ripper diff --git a/ripper.py b/ripper.py index 7d97977..54b9104 100644 --- a/ripper.py +++ b/ripper.py @@ -151,6 +151,7 @@ class Ripper(rox.Window): self.is_encoding = False self.is_cddbing = False self.stop_request = False + self.closing = False cd_logic.set_dev(RIPPER_DEV.value) self.cd_status = cd_logic.check_dev() @@ -292,6 +293,9 @@ class Ripper(rox.Window): self.do_get_tracks() self.cd_status_changed = False + if self.closing: + break + yield tasks.TimeoutBlocker(1) @@ -303,7 +307,7 @@ class Ripper(rox.Window): self.year = self.year_entry.get_text() - def stop(self, it): + def stop(self, *it): '''Stop current rip/encode process''' self.stop_request = True @@ -726,7 +730,9 @@ class Ripper(rox.Window): self.close() def close(self, button = None): - '''We're outta here!''' + '''We are outta here!''' + self.stop() + self.closing = True self.destroy() -- 2.11.4.GIT