ChaosMod/Voting: Delay starting of voting proxy

Appears to fix OnFailureToReceiveJoinConfirmation being called which then led to the "Invalid Twitch channel" error popup on newer versions
gta-chaos-mod · Feb 4, 2024 · b09bf92 · b09bf92
1 parent f8198fa
commit b09bf92
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 34 deletions.
diff --git a/ChaosMod/Components/Voting.cpp b/ChaosMod/Components/Voting.cpp
@@ -18,39 +18,6 @@ Voting::Voting(const std::array<BYTE, 3> &textColor) : Component(), m_TextColor(
 	m_EnableVoting =
 	    g_OptionsManager.GetVotingValue({ "EnableVoting", "EnableTwitchVoting" }, OPTION_DEFAULT_TWITCH_VOTING_ENABLED);
 	m_VoteablePrefix = g_OptionsManager.GetVotingValue<std::string>({ "VoteablePrefix" }, "");
-
-	if (m_EnableVoting && !Init())
-	{
-		return;
-	}
-
-	m_PipeHandle =
-	    CreateNamedPipe(L"\\\\.\\pipe\\ChaosModVVotingPipe", PIPE_ACCESS_DUPLEX,
-	                    PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_NOWAIT, 1, BUFFER_SIZE, BUFFER_SIZE, 0, NULL);
-
-	if (m_PipeHandle == INVALID_HANDLE_VALUE)
-	{
-		ErrorOutWithMsg("Error while creating a named pipe, previous instance of voting proxy might be running. Try "
-		                "reloading the mod. Reverting to normal mode.");
-
-		return;
-	}
-
-	ConnectNamedPipe(m_PipeHandle, NULL);
-
-	if (m_EnableVoting)
-	{
-		if ((m_OverlayMode == OverlayMode::OverlayIngame || m_OverlayMode == OverlayMode::OverlayOBS)
-		    && ComponentExists<EffectDispatcher>())
-		{
-			GetComponent<EffectDispatcher>()->EnableEffectTextExtraTopSpace = true;
-		}
-
-		if (ComponentExists<SplashTexts>())
-		{
-			GetComponent<SplashTexts>()->ShowVotingSplash();
-		}
-	}
 }
 
 Voting::~Voting()
@@ -77,6 +44,54 @@ void Voting::OnRun()
 		return;
 	}
 
+	if (!m_HasInitializedVoting)
+	{
+		// Only initialize voting proxy after we are fully loaded in, otherwise some weird behaviour can occur from the
+		// voting proxy, e.g. OnFailureToReceiveJoinConfirmation being raised for whatever reason
+		if (GET_IS_LOADING_SCREEN_ACTIVE())
+		{
+			return;
+		}
+
+		m_HasInitializedVoting = true;
+
+		if (!Init())
+		{
+			return;
+		}
+
+		m_PipeHandle = CreateNamedPipe(L"\\\\.\\pipe\\ChaosModVVotingPipe", PIPE_ACCESS_DUPLEX,
+		                               PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_NOWAIT, 1, BUFFER_SIZE,
+		                               BUFFER_SIZE, 0, NULL);
+
+		if (m_PipeHandle == INVALID_HANDLE_VALUE)
+		{
+			ErrorOutWithMsg(
+			    "Error while creating a named pipe, previous instance of voting proxy might be running. Try "
+			    "reloading the mod. Reverting to normal mode.");
+
+			return;
+		}
+
+		ConnectNamedPipe(m_PipeHandle, NULL);
+
+		if (m_EnableVoting)
+		{
+			if ((m_OverlayMode == OverlayMode::OverlayIngame || m_OverlayMode == OverlayMode::OverlayOBS)
+			    && ComponentExists<EffectDispatcher>())
+			{
+				GetComponent<EffectDispatcher>()->EnableEffectTextExtraTopSpace = true;
+			}
+
+			if (ComponentExists<SplashTexts>())
+			{
+				GetComponent<SplashTexts>()->ShowVotingSplash();
+			}
+		}
+
+		return;
+	}
+
 	// Check if there's been no ping for too long and error out
 	// Also if the chance system is enabled, get current vote status every second (if shown on screen)
 	auto curTick = GetTickCount64();

diff --git a/ChaosMod/Components/Voting.h b/ChaosMod/Components/Voting.h
@@ -46,7 +46,8 @@ class Voting : public Component
 
 	std::array<std::uint8_t, 3> m_TextColor;
 
-	bool m_EnableVoting;
+	bool m_EnableVoting                                = false;
+	bool m_HasInitializedVoting                        = false;
 
 	bool m_ReceivedHello                               = false;
 	bool m_HasReceivedResult                           = false;