GameMode: Fixed layout loading with "On Start" action

whitequill · Oct 9, 2022 · c47f2a6 · c47f2a6
1 parent f665399
commit c47f2a6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Library/GameMode.cpp b/Library/GameMode.cpp
@@ -381,13 +381,14 @@ void GameMode::EnterGameMode()
 		rainmeter.DeleteAllUnmanagedSkins();
 		rainmeter.DeleteAllSkins();
 		rainmeter.DeleteAllUnmanagedSkins();  // Redelete unmanaged windows caused by OnCloseAction
+
+		m_State = State::Enabled;
 	}
 	else
 	{
 		LoadLayout(m_OnStartAction);
+		m_State = State::LayoutEnabled;
 	}
-
-	m_State = State::Enabled;
 }
 
 void GameMode::ExitGameMode(bool force)

diff --git a/Library/GameMode.h b/Library/GameMode.h
@@ -19,6 +19,7 @@ class GameMode
 
 	bool IsDisabled() { return m_State == State::Disabled; }
 	bool IsEnabled() { return m_State == State::Enabled; }
+	bool IsLayoutEnabled() { return m_State == State::LayoutEnabled; }
 	bool IsForcedExit() { return m_State == State::ForcedExit; }
 
 	std::wstring& GetOnStartAction() { return m_OnStartAction; }
@@ -48,6 +49,7 @@ class GameMode
 	{
 		Disabled = 0U,
 		Enabled,
+		LayoutEnabled,
 		ForcedExit = 999U
 	};
 

diff --git a/Library/Rainmeter.cpp b/Library/Rainmeter.cpp
@@ -1856,7 +1856,7 @@ bool Rainmeter::LoadLayout(const std::wstring& name)
 	}
 
 	// Game mode: Only load layouts if game is disabled. Enabled or "ForcedExit" should not any skins.
-	if (GetGameMode().IsDisabled())
+	if (GetGameMode().IsDisabled() || GetGameMode().IsLayoutEnabled())
 	{
 		ReloadSettings();