r7952 - in /branches/1.5-stable/qt4-gui/src/core: licqgui.cpp mainwin.cpp

Author: flynd
Date: Fri Oct 29 00:46:35 2010
New Revision: 7952

Log:
Merged r7951 from trunk to close #1700.

Modified:
    branches/1.5-stable/qt4-gui/src/core/licqgui.cpp
    branches/1.5-stable/qt4-gui/src/core/mainwin.cpp

Modified: branches/1.5-stable/qt4-gui/src/core/licqgui.cpp
==============================================================================
--- branches/1.5-stable/qt4-gui/src/core/licqgui.cpp (original)
+++ branches/1.5-stable/qt4-gui/src/core/licqgui.cpp Fri Oct 29 00:46:35 2010
@@ -1723,6 +1723,7 @@
     default:
       // Ensure that main window is visible when the dock gets disabled:
       myMainWindow->show();
+      myMainWindow->raise();
       return;
   }
 

Modified: branches/1.5-stable/qt4-gui/src/core/mainwin.cpp
==============================================================================
--- branches/1.5-stable/qt4-gui/src/core/mainwin.cpp (original)
+++ branches/1.5-stable/qt4-gui/src/core/mainwin.cpp Fri Oct 29 00:46:35 2010
@@ -254,7 +254,11 @@
   updateGroups(true);
 
   setMiniMode(conf->miniMode());
-  setVisible(!conf->mainwinStartHidden() && !bStartHidden);
+  if(!conf->mainwinStartHidden() && !bStartHidden)
+  {
+    setVisible(true);
+    raise();
+  }
 
   // verify we exist
   if (Licq::gUserManager.NumOwners() == 0)