sync

[gitlive] / NewBranch.vala

diff --git a/NewBranch.vala b/NewBranch.vala
index 5173aa3..c55d3de 100644 (file)
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -52,7 +52,6 @@ public class NewBranch : Object
         //listeners
         this.el.delete_event.connect( (self, event) => {
             this.el.hide();
-            this.running = false;
             return true; 
             //test  
         });
@@ -62,7 +61,6 @@ public class NewBranch : Object
                if (response_id == 0) {
                    _this.el.hide();    
                    this.running = false; 
-                       GitMonitor.gitmonitor.start();      
                        return;
                }
                 
@@ -75,22 +73,23 @@ 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 != "" ) {
-                               success = this.repo.setActiveTicket( RooTicket.singleton().getById(ticket_id), bn);
-                       } else {
-                               success = this.repo.createBranchNamed(bn);
-                       }
+        
+                       var res = this.repo.setActiveTicket(                    
+                                RooTicket.singleton().getById(ticket_id != "" ? ticket_id : "-1"), bn
+                        );
+                        if (res) {
+                               // start the monitoring..
+                                GitMonitor.gitmonitor.start();
+                                
+                        }
             }
             
-            GitMonitor.gitmonitor.restoreQueue( this.queue );
-            GitMonitor.gitmonitor.runQueue();    
-               GitMonitor.gitmonitor.start();
+        
             this.running = false; 
         
-                
+               this.el.hide();
                 
                 
         
@@ -122,7 +121,9 @@ public class NewBranch : Object
     
     
         this.el.show_all();
+            this.el.set_keep_above(true);
        _this.dbmodel.loadTickets();
+       this.el.run();
     
     }
     public class Xcls_VBox2 : Object