X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RepoStatusPopover.bjs;h=79e88ca127207e21dfc89853da14ddbe753f27c6;hb=9b0ec931b3bb641930971d356b70d84ba8f383b8;hp=95f0e43669be61a2055122d306e20bd4ca024a12;hpb=b16d848d8a64a6d12603e2e9f9bd6e4c723ac2cb;p=gitlive

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index 95f0e436..79e88ca1 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   if (_this.repos.activeTicket != null) {\n\t   MergeBranch.singleton().show(this.repo.activeTicket, null);   \n   }\n    return false;\n}"
          },
          "label" : "Merge branch/  ticket",
          "xtype" : "Button",