projects
/
gitlive
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MergeBranch.bjs
[gitlive]
/
MergeBranch.vala
diff --git
a/MergeBranch.vala
b/MergeBranch.vala
index
48dc017
..
5eec338
100644
(file)
--- a/
MergeBranch.vala
+++ b/
MergeBranch.vala
@@
-141,7
+141,8
@@
public class MergeBranch : Object
Timeout.add_seconds(1, () => {
Timeout.add_seconds(1, () => {
-
+
+ // if we are not working on a ticket, then we should be able to pick one?
_this.dbmodel.loadTickets();
_this.actionmodel.loadActions();
_this.view.loadTicket(ticket.id);
_this.dbmodel.loadTickets();
_this.actionmodel.loadActions();
_this.view.loadTicket(ticket.id);
@@
-149,8
+150,9
@@
public class MergeBranch : Object
_this.spinner.el.hide();
this.table.el.show();
_this.spinner.el.hide();
this.table.el.show();
- return true;
- }
+ return false;
+ });
+
this.el.run();
}
this.el.run();
}