fixing #1860

livesupport/src/products/gLiveSupport/src/LoginWindow.cxx

@@ -202,6 +202,7 @@ LoginWindow :: LoginWindow (Ptr<GLiveSupport>::Ref      gLiveSupport,
     set_name("loginWindow");
     set_modal(true);
     property_window_position().set_value(Gtk::WIN_POS_CENTER);
+    set_keep_above(true);
     set_resizable(false);
     property_destroy_with_parent().set_value(false);
     set_default(*okButton);

livesupport/src/products/gLiveSupport/src/MasterPanelWindow.cxx

@@ -466,9 +466,7 @@ MasterPanelWindow :: updateLiveModeWindow(Ptr<Playable>::Ref    playable)
         liveModeWindow->addItem(playable);
     }
     
-    if (!liveModeWindow->is_visible()) {
+    liveModeWindow->present();
-        liveModeWindow->show();
-    }
 }
 
 
@@ -476,7 +474,7 @@ MasterPanelWindow :: updateLiveModeWindow(Ptr<Playable>::Ref    playable)
  *  The event when the upload file button has been clicked.
  *----------------------------------------------------------------------------*/
 void
-MasterPanelWindow :: onUploadFileButtonClicked(void)                throw ()
+MasterPanelWindow :: updateUploadFileWindow(void)                   throw ()
 {
     if (!uploadFileWindow.get()) {
         Ptr<ResourceBundle>::Ref    bundle;
@@ -490,15 +488,9 @@ MasterPanelWindow :: onUploadFileButtonClicked(void)                throw ()
         uploadFileWindow.reset(new UploadFileWindow(gLiveSupport,
                                                     bundle,
                                                     uploadFileButton));
-        uploadFileWindow->show();
-        return;
     }
 
-    if (!uploadFileWindow->is_visible()) {
+    uploadFileWindow->present();
-        uploadFileWindow->show();
-    } else {
-        uploadFileWindow->hide();
-    }
 }
 
 
@@ -538,9 +530,7 @@ MasterPanelWindow :: updateScratchpadWindow(Ptr<Playable>::Ref  playable)
         scratchpadWindow->addItem(playable);
     }
     
-    if (!scratchpadWindow->is_visible()) {
+    scratchpadWindow->present();
-        scratchpadWindow->show();
-    }
 }
 
 
@@ -567,9 +557,7 @@ MasterPanelWindow :: updateSimplePlaylistMgmtWindow(void)           throw ()
     
     simplePlaylistMgmtWindow->showContents();
     
-    if (!simplePlaylistMgmtWindow->is_visible()) {
+    simplePlaylistMgmtWindow->present();
-        simplePlaylistMgmtWindow->show();
-    }
 }
 
 
@@ -611,9 +599,7 @@ MasterPanelWindow :: updateSchedulerWindow(
         return;
     }
 
-    if (!schedulerWindow->is_visible()) {
+    schedulerWindow->present();
-        schedulerWindow->show();
-    }
 }
 
 
@@ -637,9 +623,7 @@ MasterPanelWindow :: updateSearchWindow(void)                       throw ()
                                             searchButton));
     }
     
-    if (!searchWindow->is_visible()) {
+    searchWindow->present();
-        searchWindow->show();
-    }
 }
 
 
@@ -667,9 +651,7 @@ MasterPanelWindow :: updateOptionsWindow(void)                      throw ()
         }
     }
 
-    if (!optionsWindow->is_visible()) {
+    optionsWindow->present();
-        optionsWindow->show();
-    }
 }
 
 
@@ -885,9 +867,7 @@ MasterPanelWindow :: uploadToHub(Ptr<Playable>::Ref     playable)
     
     bool    success = searchWindow->uploadToHub(playable);
     
-    if (success && !searchWindow->is_visible()) {
+    searchWindow->present();
-        searchWindow->show();
-    }
 }
 
 

livesupport/src/products/gLiveSupport/src/MasterPanelWindow.h

@@ -291,7 +291,15 @@ class MasterPanelWindow : public Gtk::Window, public LocalizedObject
          *  pressed.
          */
         virtual void
-        onUploadFileButtonClicked(void)                     throw ();
+        onUploadFileButtonClicked(void)                     throw ()
+        {
+            if (!uploadFileWindow ||
+                    uploadFileWindow && !uploadFileWindow->is_visible()) {
+                updateUploadFileWindow();
+            } else {
+                uploadFileWindow->hide();
+            }
+        }
 
         /**
          *  Function to catch the event of the live mode button being
@@ -469,6 +477,12 @@ class MasterPanelWindow : public Gtk::Window, public LocalizedObject
         void
         createScratchpadWindow(void)                            throw ();
 
+        /**
+         *  Update the Upload File window.
+         */
+        void
+        updateUploadFileWindow(void)                            throw ();
+
         /**
          *  Update the Scratchpad window.
          */