X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=MergeBranch.vala;h=5eec33874b0a3a10d9d1cbddafc9342d0c905595;hb=a6c214d30b033aadeec72b2532daccacbfadadf8;hp=48dc0179e7a802b5955f638e63585bf690acebb9;hpb=e7793b01e94debb6af0432c2639816ddcfcca247;p=gitlive

diff --git a/MergeBranch.vala b/MergeBranch.vala
index 48dc0179..5eec3387 100644
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -141,7 +141,8 @@ public class MergeBranch : Object
         
     	
     	Timeout.add_seconds(1, () => {
-    	
+    		
+    		// if we are not working on a ticket, then we should be able to pick one?
     	 	_this.dbmodel.loadTickets();
     	 	_this.actionmodel.loadActions();
     		_this.view.loadTicket(ticket.id);
@@ -149,8 +150,9 @@ public class MergeBranch : Object
     		_this.spinner.el.hide();	
     
     		this.table.el.show();
-    		return true;
-    	}
+    		return false;
+    	});
+    	
     	this.el.run();
     	 
     }