From d4ea961dae3f1e143c4d94e70ce69e288777b27f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Cort=C3=A9z?= Date: Thu, 12 Feb 2015 10:35:13 -0600 Subject: [PATCH] A bugfix in deleting a timeline --- src/controller/buffersController.py | 4 ++++ src/controller/mainController.py | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/controller/buffersController.py b/src/controller/buffersController.py index fe8d8de8..1369aa8d 100644 --- a/src/controller/buffersController.py +++ b/src/controller/buffersController.py @@ -220,8 +220,12 @@ class baseBufferController(bufferController): if dlg == widgetUtils.YES: if self.name[:9] in self.session.settings["other_buffers"]["timelines"]: self.session.settings["other_buffers"]["timelines"].remove(self.name[:9]) + return True + elif dlg == widgetUtils.NO: + return False else: output.speak(_(u"This buffer is not a timeline; it can't be deleted.")) + return False def put_items_on_list(self, number_of_items): log.debug("The list contains %d items " % (self.buffer.list.get_count(),)) diff --git a/src/controller/mainController.py b/src/controller/mainController.py index 5f776964..00a8f202 100644 --- a/src/controller/mainController.py +++ b/src/controller/mainController.py @@ -575,7 +575,8 @@ class Controller(object): buffer = self.get_current_buffer() if not hasattr(buffer, "account"): return buff = self.view.search(buffer.name, buffer.account) - buffer.remove_buffer() + answer = buffer.remove_buffer() + if answer == False: return self.view.delete_buffer(buff) buffer.session.sound.play("delete_timeline.ogg") self.buffers.remove(buffer)