From: Alan Knowles <alan@roojs.com>
Date: Wed, 19 Dec 2018 04:57:57 +0000 (+0800)
Subject: RepoStatusPopover.bjs
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=88f9b7591292a15ee2c4bd1b4d06ba563053246e

RepoStatusPopover.bjs
RepoStatusPopover.vala
---

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index 95f0e436..deadfc29 100644
--- a/RepoStatusPopover.bjs
+++ b/RepoStatusPopover.bjs
@@ -148,7 +148,7 @@
         },
         {
          "listeners" : {
-          "button_press_event" : "() => {\n\n   _this.el.hide();\n   Clones.singleton().el.hide();\n   MergeBranch.singleton().show(this.ticket, null);   \n    return false;\n}"
+          "button_press_event" : "() => {\n\n   _this.el.hide();\n   Clones.singleton().el.response(-1);\n   MergeBranch.singleton().show(this.ticket, null);   \n    return false;\n}"
          },
          "label" : "Merge branch/  ticket",
          "xtype" : "Button",
diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index 67463451..b4621d18 100644
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -587,7 +587,7 @@ public class RepoStatusPopover : Object
             this.el.button_press_event.connect( () => {
             
                _this.el.hide();
-               Clones.singleton().el.hide();
+               Clones.singleton().el.response(-1);
                MergeBranch.singleton().show(this.ticket, null);   
                 return false;
             });