X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=NewBranch.vala;h=602922edb30568ab45f7266e8044ec4590dcf48a;hp=640ae38eba348b6af36151f0d67fdeaf14dc26e2;hb=1ca3cefd12af4ec1e3cfa3469fbcfc1afc129723;hpb=fd9fb18c5cf70445c33adab625622222801c12ac

diff --git a/NewBranch.vala b/NewBranch.vala
index 640ae38e..602922ed 100644
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -20,6 +20,7 @@ public class NewBranch : Object
         // my vars (def)
     public GitRepo? repo;
     public bool running;
+    public Gee.ArrayList<GitMonitorQueue> queue;
 
     // ctor
     public NewBranch()
@@ -29,7 +30,8 @@ public class NewBranch : Object
 
         // my vars (dec)
         this.repo = null;
-        this.running = true;
+        this.running = false;
+        this.queue = null;
 
         // set gobject values
         this.el.title = "Create a working branch ";
@@ -61,6 +63,7 @@ public class NewBranch : Object
         	    this.running = false; 
         	 	return;
         	}
+        	 
         	// have they selected a ticket..
         	// make that the current active ticket?
         	// we really need to store locally what ticket is being worked on..
@@ -75,13 +78,13 @@ public class NewBranch : Object
             	if (ticket_id != "" ) {
         			this.repo.setActiveTicket( RooTicket.singleton().getById(ticket_id), bn);
         		} else {
-        			this.repo.createBranchNamed(bn);
+        			this.repo.setActiveTicket( RooTicket.singleton().getById("-1"), bn);
         		}
             }
         
-        		    this.running = false; 
+            this.running = false; 
         
-        	 
+        	this.el.hide();
         	 
         	 
         
@@ -95,12 +98,17 @@ public class NewBranch : Object
     }
 
     // user defined functions
-    public   void show ( GitRepo repo ) 
+    public   void show ( GitRepo repo, Gee.ArrayList<GitMonitorQueue> queue ) 
     {
          // this.el.set_gravity(Gdk.Gravity.NORTH);
-        if (this.running) {
-        	return;
+        if (this.running) { // should not happen!!
+        	GLib.error("new branch show called, when already being displayed?");
     	}
+    	this.queue = queue;
+    	
+    	this.running  = true;
+    	GitMonitor.gitmonitor.stop();
+    	
         this.repo = repo;
         
     	this.el.move((Gdk.Screen.width() / 2)- 250 ,0);