X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=MergeBranch.vala;h=a0aa781bfa11ce6bb8854f2d52705fa59da823b2;hp=43820cc85605ecfa29396eb5239ec49aa07560b3;hb=1ca3cefd12af4ec1e3cfa3469fbcfc1afc129723;hpb=2a6a46caf4f1d149a8e72cb0fb0c90f9923a27bb

diff --git a/MergeBranch.vala b/MergeBranch.vala
index 43820cc8..a0aa781b 100644
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -499,12 +499,21 @@ public class MergeBranch : Object
             var el = this.el;
             
             el.append(out iter);
-        
-            
             el.set_value(iter, 0, "");
             el.set_value(iter, 1, "-- select a ticket --");
             
             _this.ticketsel.el.set_active_iter(iter);
+            
+            if (_this.ticket != null &&  _this.ticket.id == "-1") {
+        		el.append(out iter);
+        		el.set_value(iter, 0, "-1");
+        		el.set_value(iter, 1, "Temporary Branch - No ticket specified/relivant");
+                _this.ticketsel.el.set_active_iter(iter);	
+            }
+            
+            
+            
+            
             var tickets = RooTicket.singleton().tickets;
             foreach(var ticket in tickets) {
             
@@ -512,7 +521,7 @@ public class MergeBranch : Object
         
                 el.set_value(iter, 0, ticket.id);
                 el.set_value(iter, 1, "#%s [%s] %s".printf( ticket.id, ticket.project_id_name , ticket.summary));
-        		if (_this.ticket.id == ticket.id) {
+        		if (_this.ticket != null && _this.ticket.id == ticket.id) {
         		    _this.ticketsel.el.set_active_iter(iter);
         	    }