README.txt

[gitlive] / Merger.js

diff --git a/Merger.js b/Merger.js
index d654480..ed605d4 100644 (file)
--- a/Merger.js
+++ b/Merger.js
@@ -678,13 +678,16 @@ Merger=new XObject({
                                                                 buttons : Gtk.ButtonsType.OK, 
                                                                 text: e.message
                                                         });
+                                                        emsg.set_transient_for(Merger.el);
+                                                        emsg.set_modal(true);
                                                         emsg.run();
                                                         emsg.destroy();
                                                         Merger.repo.stash(); // revert change.. - so we can go back...
                                                     }
                                                     msg.show_all();
+                                                    msg.set_markup("Changing to previous branch");
                                                     Merger.repo.checkout(model.working);
-                                                    msg.hide();
+                                                    
                                                     
                                                     // if gitlive was previously running warn the user that it is now paused..
                                                     /*
@@ -699,10 +702,11 @@ Merger=new XObject({
                                                     var _t = this;
                                                     GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 5, function() {
                                                          imports.GitMonitor.GitMonitor.resume();
-                                                          
+                                                         msg.hide();
+                                                         msg.destroy();
                                                           _t.get('/historyTreeStore').loadTree();
-                                                           this.get('/changedFilesStore').el.clear();
-                                                          this.get('/patchview').showDiff(files); 
+                                                          _t.get('/changedFilesStore').el.clear();
+                                                          _t.get('/patchview').showDiff(files); 
                                                          return false; //only once.
                                                     });