X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NewBranch.vala;h=b3bc91d9609ca419447f0c9e0cc5be47441a15a3;hb=aa918439d9cb7113787b05154fa6d00154cbb8a8;hp=583cb0eba335e3f1c77ebdcf1a5a4e219d5c9235;hpb=f38120dee592b816594ab635c624aa858e00b4c1;p=gitlive diff --git a/NewBranch.vala b/NewBranch.vala index 583cb0eb..b3bc91d9 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -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,6 +60,7 @@ public class NewBranch : Object if (response_id == 0) { _this.el.hide(); this.running = false; + GitMonitor.gitmonitor.start(); return; } @@ -71,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; @@ -102,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);