[meld/ui-next] meldwindow: Move scheduler cancellation to melddoc



commit 819d03ca20f21216158b265a9f62bea7887e1cb8
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Feb 1 07:45:25 2019 +1000

    meldwindow: Move scheduler cancellation to melddoc

 meld/melddoc.py    | 4 ++++
 meld/meldwindow.py | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/meld/melddoc.py b/meld/melddoc.py
index 5ccec46b..bd3e0136 100644
--- a/meld/melddoc.py
+++ b/meld/melddoc.py
@@ -116,6 +116,10 @@ class MeldDoc(LabeledObjectMixin, GObject.GObject):
         """Get the comparison type and URI(s) being compared"""
         pass
 
+    def on_action_cancel(self, *args):
+        if self.scheduler.tasks_pending():
+            self.scheduler.remove_task(self.scheduler.get_current_task())
+
     def save(self):
         pass
 
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index 78e1d592..1f83f4d5 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -471,9 +471,7 @@ class MeldWindow(Gtk.ApplicationWindow):
         self.current_doc().open_external()
 
     def on_toolbar_stop_clicked(self, *args):
-        doc = self.current_doc()
-        if doc.scheduler.tasks_pending():
-            doc.scheduler.remove_task(doc.scheduler.get_current_task())
+        self.current_doc().on_action_cancel()
 
     def page_removed(self, page, status):
         if hasattr(page, 'scheduler'):


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]