X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RepoStatusPopover.bjs;h=b4bf4aeb0b04b717edc69d82c169ac96e3c4868f;hb=267f1afc73bb376451b5ec8f0014f878f472d740;hp=deadfc29e4f2912ae5c20a374488e5a22380cf75;hpb=88f9b7591292a15ee2c4bd1b4d06ba563053246e;p=gitlive

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index deadfc29..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.ticket, 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",