Fixed ActivateAtStart option not working correctly when used with SK'…

…s "Continue Rendering" window management feature
gmh5225 · Aug 4, 2023 · a5b186d · a5b186d
1 parent 03ba0e7
commit a5b186d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,4 +1,9 @@
-23.8.3.4
+23.8.3.5
+========
+ + Fixed ActivateAtStart option not working correctly when used with SK's
+     "Continue Rendering" window management feature
+
+23.8.3.4
 ========
  + Fixed potential black screen in some multi-window applications such as VLC
 

diff --git a/include/SpecialK/DLL_VERSION.H b/include/SpecialK/DLL_VERSION.H
@@ -3,8 +3,8 @@
 #define SK_YEAR 23
 #define SK_MONTH 8
 #define SK_DATE  3
-#define SK_REV_N 4
-#define SK_REV   4
+#define SK_REV_N 5
+#define SK_REV   5
 
 #ifndef _A2
 #define _A2(a)     #a

diff --git a/src/core.cpp b/src/core.cpp
@@ -1614,6 +1614,8 @@ SK_StartupCore (const wchar_t* backend, void* callback)
 {
  try
  {
+   AllowSetForegroundWindow (GetCurrentProcessId ());
+
   if ( SK_GetProcAddress ( L"NtDll",
                             "wine_get_version" ) != nullptr )
   {
@@ -2868,11 +2870,17 @@ SK_FrameCallback ( SK_RenderBackend& rb,
         {
           if (game_window.hWnd != 0)
           {
-            if (config.window.activate_at_start)
+            if (config.window.activate_at_start || config.window.background_render)
             {
               // Activate the game window one time
               //   (workaround wonkiness from splash screens, etc.)
-              SK_RunOnce (SetForegroundWindow (game_window.hWnd));
+              SK_RunOnce (
+              {
+                game_window.CallProc (game_window.hWnd, WM_ACTIVATEAPP, TRUE,                      0);
+                game_window.CallProc (game_window.hWnd, WM_ACTIVATE,    MAKEWPARAM (WA_ACTIVE, 0), 0);
+                game_window.CallProc (game_window.hWnd, WM_SETFOCUS,    0,                         0);
+                SetForegroundWindow ( game_window.hWnd );
+              });
             }
 
             // If user wants position / style overrides, kick them off on the first