fix commits

[gitlive] / NewBranch.vala

diff --git a/NewBranch.vala b/NewBranch.vala
index 1a3a079..bd6fedd 100644 (file)
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -37,7 +37,7 @@ public class NewBranch : Object
 
         // my vars (dec)
         this.repo = null;
-        this.running = true;
+        this.running = false;
         this.queue = null;
 
         // set gobject values
@@ -59,14 +59,8 @@ public class NewBranch : Object
         this.el.response.connect( (self, response_id) =>  { 
           
                GLib.debug("got %d", (int) response_id);
-               if (response_id < 1) {
-                   _this.el.hide();    
-                   this.running = false; 
-                       return;
-               }
-               
-               
                
+                
                
                 
                // have they selected a ticket..
@@ -76,13 +70,16 @@ public class NewBranch : Object
                // -- each repo would have their active ticket (only one per repo)
                // -- so we could just store that in there
                // -- initial load can check the contents of the ticket files on first scan.
-               var ticket_id = _this.ticketsel.selectedTicketId();
-               
-               if (ticket_id == "") {
-                       _this.ticketsel.el.get_child().get_style_context().add_class("warning");
-                       return;
+        
+                
+               if (response_id < 1) {
+                   _this.el.hide();    
+                   this.running = false; 
+                       return;
                }
                
+               var ticket_id = _this.ticketsel.selectedTicketId();
+               
             if (this.repo != null) {
                var bn = _this.name.el.get_text();
         
@@ -95,7 +92,7 @@ public class NewBranch : Object
                                 
                         }
             }
-            
+             
         
             this.running = false; 
         
@@ -718,7 +715,16 @@ public class NewBranch : Object
 
             //listeners
             this.el.clicked.connect( () => {
+            
                GLib.debug("fire response = 1");
+               
+               var ticket_id = _this.ticketsel.selectedTicketId();
+               
+               if (ticket_id == "") {
+                       _this.ticketsel.el.get_child().get_style_context().add_class("warning");
+                       return;
+               }
+                
                _this.el.response(1);
             });
         }