projects
/
gitlive
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #5626 - bug with closing merge dialog
[gitlive]
/
MergeBranch.vala
diff --git
a/MergeBranch.vala
b/MergeBranch.vala
index
90a65b3
..
5641695
100644
(file)
--- a/
MergeBranch.vala
+++ b/
MergeBranch.vala
@@
-62,7
+62,7
@@
public class MergeBranch : Object
this.el.response.connect( (self, response_id) => {
GLib.debug("got %d", (int) response_id);
this.el.response.connect( (self, response_id) => {
GLib.debug("got %d", (int) response_id);
- if (response_id
== 0
) {
+ if (response_id
< 1
) {
_this.el.hide();
this.running = false;
GitMonitor.gitmonitor.start();
_this.el.hide();
this.running = false;
GitMonitor.gitmonitor.start();
@@
-677,6
+677,8
@@
public class MergeBranch : Object
this.el = new WebKit.WebView();
// my vars (dec)
this.el = new WebKit.WebView();
// my vars (dec)
+
+ // set gobject values
}
// user defined functions
}
// user defined functions