X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RepoStatusPopover.vala;h=9e40c63daa556caedce44ebcf738874623731de6;hb=68b480d67843927a38e1a087aa75cdaf40daa394;hp=b4621d186d0f1986ecb2b2484ef034311527a0d3;hpb=88f9b7591292a15ee2c4bd1b4d06ba563053246e;p=gitlive

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index b4621d18..9e40c63d 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.ticket, null);   
+               if (_this.repo.activeTicket != null) {
+            	   MergeBranch.singleton().show(_this.repo.activeTicket, null);   
+               }
                 return false;
             });
         }
@@ -608,7 +610,7 @@ public class RepoStatusPopover : Object
         public Xcls_Button19(RepoStatusPopover _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Button();
+            this.el = new GtkButton.new_from_stock();
 
             // my vars (dec)
 
@@ -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);