RepoStatusPopover.bjs

RepoStatusPopover.vala

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index aca3975..5bb23ad 100644 (file)
--- 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 548a11c..8ac1d26 100644 (file)
--- 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;
             });