Merge pull request #6080 from BOINC/dpa_gui_activate

BOINC · Feb 14, 2025 · 14d20d2 · 14d20d2
2 parents c3165de + 71ac0ef
commit 14d20d2
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
@@ -1105,17 +1105,19 @@ int CBOINCGUIApp::IdleTrackerDetach() {
 void CBOINCGUIApp::OnActivateApp(wxActivateEvent& event) {
     m_bProcessingActivateAppEvent = true;
 
-    if (event.GetActive()) {
+
+#ifndef __WXMSW__  // On Win, the following raises the wrong window
+    if (event.GetActive())
+#endif
+    {
 #ifdef __WXMAC__
         ShowInterface();
-#else
-#ifdef __WXGTK__
+#elif defined(__WXGTK__)
         // Linux allows the Event Log to be brought forward and made active
         // even if we have a modal dialog displayed (associated with our
         // main frame.) This test is needed to allow bringing the modal
         // dialog forward again by clicking on its title bar.
         if (!IsModalDialogDisplayed())
-#endif
         {
             bool keepEventLogInFront = m_bEventLogWasActive;