Merge branch 'master' of https://github.com/youneuoy/M2TWEOP-library

youneuoy · Oct 6, 2024 · d635e80 · d635e80
2 parents 64b709c + 9a650d6
commit d635e80
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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;

diff --git a/buildEOP.ps1 b/buildEOP.ps1
@@ -51,6 +51,7 @@ new-item ./M2TWEOPGenerated  -itemtype directory -erroraction 'silentlycontinue'
 
 Copy-Item -Path  "M2TWEOP DataFiles\*" -Destination "./M2TWEOPGenerated" -recurse
 
+Remove-Item -Path "documentationGenerator\EOPDocs\build\html\.buildinfo" -recurse -erroraction 'silentlycontinue' -Force
 Get-ChildItem -Path "documentationGenerator\EOPDocs\build\html\*" -erroraction 'continue'
 CopyFilesToFolder "documentationGenerator\EOPDocs\build\html" "./M2TWEOPGenerated/eopData/documentation"
 

diff --git a/buildEOPDev_release.ps1 b/buildEOPDev_release.ps1
@@ -55,6 +55,7 @@ Remove-Item -Path "./M2TWEOPGenerated/eopData/eopScripts/luaPluginScript.lua" -F
 Remove-Item -Path "./M2TWEOPGenerated/eopData/eopScripts/redist" -Force -Recurse -erroraction 'silentlycontinue'
 Remove-Item -Path "./M2TWEOPGenerated/eopData/eopScripts/helpers" -Force -Recurse -erroraction 'silentlycontinue'
 Remove-Item -Path "./M2TWEOPGenerated/eopData/config" -recurse -erroraction 'silentlycontinue' -Force
+Remove-Item -Path "documentationGenerator\EOPDocs\build\html\.buildinfo" -recurse -erroraction 'silentlycontinue' -Force
 Remove-Item -Path "./.vs" -recurse -erroraction 'silentlycontinue' -Force
 
 Get-ChildItem -Path "documentationGenerator\EOPDocs\build\html\*" -erroraction 'continue'