X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=RepoStatusPopover.vala;fp=RepoStatusPopover.vala;h=b43c6eef87c0fb2207aeb130502e7a230ff1e17e;hp=dbe3bb1d0d1bac31c7e59785ddd1c11d1f1a8a14;hb=7650c3d24f43364f9f88a7515e9b9823cdecf875;hpb=4a4852b09ec5d48748d204dd8b658146bd5eb3a5

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index dbe3bb1d..b43c6eef 100644
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -60,6 +60,13 @@ public class RepoStatusPopover : Object
       
     	//this.el.set_position(Gtk.PositionType.RIGHT);
     
+    	if (repo.activeTicket == null) {
+    		_this.btn_merge.el.set_sensitive(false);
+    	} else {
+    		_this.btn_merge.el.set_sensitive(true);
+    	}
+    
+    
     	// window + header?
     	 GLib.debug("SHOWALL - POPIP\n");
     	this.el.show_all();