diff --git a/M2TWEOP Code/M2TWEOP GUI/gameRunnerUI.cpp b/M2TWEOP Code/M2TWEOP GUI/gameRunnerUI.cpp index 649a0613..321049a8 100644 --- a/M2TWEOP Code/M2TWEOP GUI/gameRunnerUI.cpp +++ b/M2TWEOP Code/M2TWEOP GUI/gameRunnerUI.cpp @@ -95,7 +95,7 @@ namespace gameRunnerUI void maintainGUI() { - if ((startProcess.isRunEnded == true && startProcess.isGetResponse == true)) + if (startProcess.isRunEnded == true && startProcess.isGetResponse == true) { std::this_thread::sleep_for(std::chrono::seconds(3)); if (helpers::isProcessRunning(dataG::data.gameData.exeName) == false) @@ -109,7 +109,7 @@ namespace gameRunnerUI exit(0); } } - if ((dataG::data.gameData.freecamIntegration == true && dataG::data.gameData.freecamStarted == false && helpers::isProcessRunning(dataG::data.gameData.exeName) == true)) + if ((dataG::data.gameData.freecamIntegration == true) && (dataG::data.gameData.freecamStarted == false) && (helpers::isProcessRunning(dataG::data.gameData.exeName) == true)) { std::this_thread::sleep_for(std::chrono::seconds(5)); // Open Freecam if we are using the integration after waiting a bit for the game to start diff --git a/M2TWEOP Code/M2TWEOP GUI/mainUI.cpp b/M2TWEOP Code/M2TWEOP GUI/mainUI.cpp index 28b674d9..74691a41 100644 --- a/M2TWEOP Code/M2TWEOP GUI/mainUI.cpp +++ b/M2TWEOP Code/M2TWEOP GUI/mainUI.cpp @@ -22,7 +22,7 @@ namespace mainUI bool isModSettingsUIOpen = false; bool isGameRunnerUIOpen = false; - bool isDiscordUIOpen = false; + bool keepGuiOpen = false; } childs; void tryJustStartMod() @@ -63,11 +63,11 @@ namespace mainUI { int openStatus = gameRunnerUI::drawUI(&childs.isGameRunnerUIOpen); if (openStatus == 2) { - childs.isDiscordUIOpen = true; + childs.keepGuiOpen = true; } return 0; } - else if (childs.isDiscordUIOpen == true || dataG::data.gameData.freecamIntegration == true) + else if (childs.keepGuiOpen == true) { gameRunnerUI::maintainGUI(); return 0;