RepoStatusPopover.bjs

[gitlive] / RepoStatusPopover.vala

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index b4621d1..88f670a 100644 (file)
--- 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.ticket, null);   
+               if (_this.repo.activeTicket != null) {
+                  MergeBranch.singleton().show(_this.repo.activeTicket, null);   
+               }
                 return false;
             });
         }
@@ -620,7 +622,7 @@ public class RepoStatusPopover : Object
               
             
             
-                Clones.singleton().el.hide();
+                  Clones.singleton().el.response(-1);
               
                _this.el.hide();
                Ticket.singleton().show( _this.repo);