sync

[gitlive] / NewBranch.vala

diff --git a/NewBranch.vala b/NewBranch.vala
index 640ae38..b3bc91d 100644 (file)
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -29,7 +29,7 @@ public class NewBranch : Object
 
         // my vars (dec)
         this.repo = null;
-        this.running = true;
+        this.running = false;
 
         // set gobject values
         this.el.title = "Create a working branch ";
@@ -50,6 +50,7 @@ public class NewBranch : Object
         //listeners
         this.el.delete_event.connect( (self, event) => {
             this.el.hide();
+            this.running = false;
             return true; 
             //test  
         });
@@ -59,8 +60,10 @@ public class NewBranch : Object
                if (response_id == 0) {
                    _this.el.hide();    
                    this.running = false; 
+                       GitMonitor.gitmonitor.start();      
                        return;
                }
+                
                // have they selected a ticket..
                // make that the current active ticket?
                // we really need to store locally what ticket is being worked on..
@@ -70,16 +73,17 @@ public class NewBranch : Object
                // -- initial load can check the contents of the ticket files on first scan.
                var ticket_id = _this.ticketsel.selectedTicketId();
                
+               var success = true;
             if (this.repo != null) {
                var bn = _this.name.el.get_text();
                if (ticket_id != "" ) {
-                               this.repo.setActiveTicket( RooTicket.singleton().getById(ticket_id), bn);
+                               success = this.repo.setActiveTicket( RooTicket.singleton().getById(ticket_id), bn);
                        } else {
-                               this.repo.createBranchNamed(bn);
+                               success = this.repo.createBranchNamed(bn);
                        }
             }
-        
-                           this.running = false; 
+               GitMonitor.gitmonitor.start();
+            this.running = false; 
         
                 
                 
@@ -101,6 +105,9 @@ public class NewBranch : Object
         if (this.running) {
                return;
        }
+       this.running  = true;
+       GitMonitor.gitmonitor.stop();
+       
         this.repo = repo;
         
        this.el.move((Gdk.Screen.width() / 2)- 250 ,0);