Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33 from APAmk2/main

Browse Source 
Windows: More proper shutdown
This commit is contained in:
void_17
2026-03-02 01:28:47 +07:00
committed by GitHub
parent 3bf5db9584 3db164d913
commit 99a8c53bc1
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Minecraft.Client/Windows64/Windows64_App.cpp
View File

@@ -14,6 +14,7 @@ CConsoleMinecraftApp app;
CConsoleMinecraftApp::CConsoleMinecraftApp() : CMinecraftApp() CConsoleMinecraftApp::CConsoleMinecraftApp() : CMinecraftApp()
{ {
m_bShutdown = false;
} }
void CConsoleMinecraftApp::SetRichPresenceContext(int iPad, int contextId) void CConsoleMinecraftApp::SetRichPresenceContext(int iPad, int contextId)
@@ -26,8 +27,7 @@ void CConsoleMinecraftApp::StoreLaunchData()
} }
void CConsoleMinecraftApp::ExitGame() void CConsoleMinecraftApp::ExitGame()
{ {
// This is likely not the correct way to exit the game, but it will do for now m_bShutdown = true;
ExitProcess(0);
} }
void CConsoleMinecraftApp::FatalLoadError() void CConsoleMinecraftApp::FatalLoadError()
{ {

2
Minecraft.Client/Windows64/Windows64_App.h
View File

@@ -29,6 +29,8 @@ public:
// original code // original code
virtual void TemporaryCreateGameStart(); virtual void TemporaryCreateGameStart();
bool m_bShutdown;
}; };
extern CConsoleMinecraftApp app; extern CConsoleMinecraftApp app;

2
Minecraft.Client/Windows64/Windows64_Minecraft.cpp
View File

@@ -1034,7 +1034,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
} }
#endif #endif
MSG msg = {0}; MSG msg = {0};
while( WM_QUIT != msg.message ) while( WM_QUIT != msg.message && !app.m_bShutdown)
{ {
if( PeekMessage( &msg, NULL, 0, 0, PM_REMOVE ) ) if( PeekMessage( &msg, NULL, 0, 0, PM_REMOVE ) )
{ {