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

RepoStatusPopover.bjs
RepoStatusPopover.vala
---

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index aca39758..5bb23ad7 100644
--- a/RepoStatusPopover.bjs
+++ b/RepoStatusPopover.bjs
@@ -148,7 +148,7 @@
         },
         {
          "listeners" : {
-          "button_press_event" : "() => {\n\n   _this.el.hide();\n   Clones.singleton().el.response(-1);\n   if (_this.repos.activeTicket != null) {\n\t   MergeBranch.singleton().show(this.repos.activeTicket, null);   \n   }\n    return false;\n}"
+          "button_press_event" : "() => {\n\n   _this.el.hide();\n   Clones.singleton().el.response(-1);\n   if (_this.repo.activeTicket != null) {\n\t   MergeBranch.singleton().show(_this.repo.activeTicket, null);   \n   }\n    return false;\n}"
          },
          "label" : "Merge branch/  ticket",
          "xtype" : "Button",
diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index 548a11cd..8ac1d265 100644
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -588,8 +588,8 @@ public class RepoStatusPopover : Object
             
                _this.el.hide();
                Clones.singleton().el.response(-1);
-               if (_this.repos.activeTicket != null) {
-            	   MergeBranch.singleton().show(this.repos.activeTicket, null);   
+               if (_this.repo.activeTicket != null) {
+            	   MergeBranch.singleton().show(_this.repo.activeTicket, null);   
                }
                 return false;
             });