Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit 2eced07090c5 · 2024-12-25T04:11:21.000Z
8d7167a Fast fix for #3900 (#3906)
diff --git a/Client/game_sa/CGameSA.cpp b/Client/game_sa/CGameSA.cpp
@@ -253,7 +253,7 @@ CGameSA::CGameSA()
         error += ": ";
         error += e.what();
 
-        MessageBoxUTF8(nullptr, error.c_str(), _("Error"), MB_ICONERROR | MB_OK);
+        MessageBoxUTF8(nullptr, error, _("Error"), MB_ICONERROR | MB_OK);
         ExitProcess(EXIT_FAILURE);
     }
     catch (const std::exception& e)

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ CGameSA::CGameSA()`
`253`	`253`	`error += ": ";`
`254`	`254`	`error += e.what();`
`255`	`255`
`256`		`- MessageBoxUTF8(nullptr, error.c_str(), _("Error"), MB_ICONERROR \| MB_OK);`
	`256`	`+ MessageBoxUTF8(nullptr, error, _("Error"), MB_ICONERROR \| MB_OK);`
`257`	`257`	`ExitProcess(EXIT_FAILURE);`
`258`	`258`	`}`
`259`	`259`	`catch (const std::exception& e)`