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

RepoStatusPopover.bjs
RepoStatusPopover.vala
---

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index 0b27a28c..b4bf4aeb 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   MergeBranch.singleton().show(this.repo.activeTicket, null);   \n    return false;\n}"
+          "button_press_event" : "() => {\n\n   _this.el.hide();\n   Clones.singleton().el.response(-1);\n   if (this.repo.activeTicket) {\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 1e6a3c6b..5f0b2577 100644
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -588,7 +588,9 @@ public class RepoStatusPopover : Object
             
                _this.el.hide();
                Clones.singleton().el.response(-1);
-               MergeBranch.singleton().show(this.repo.activeTicket, null);   
+               if (this.repo.activeTicket) {
+            	   MergeBranch.singleton().show(this.repo.activeTicket, null);   
+               }
                 return false;
             });
         }