Merge branch 'main' into dec-2014

Minecraft.Client/Windows64/Windows64_App.cpp

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

Minecraft.Client/Windows64/Windows64_App.h

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

Minecraft.Client/Windows64/Windows64_Minecraft.cpp

@@ -716,26 +716,6 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	UNREFERENCED_PARAMETER(hPrevInstance);
 	UNREFERENCED_PARAMETER(lpCmdLine);
 
-
-	WCHAR exePath[MAX_PATH] = { 0 };
-	GetModuleFileNameW(NULL, exePath, MAX_PATH);
-	WCHAR* lastSlash = wcsrchr(exePath, L'\\');
-	if (lastSlash) {
-		*lastSlash = L'\0';
-
-		WCHAR devCheckPath[MAX_PATH] = { 0 };
-		swprintf_s(devCheckPath, MAX_PATH, L"%s\\..\\..\\Minecraft.Client\\Minecraft.Client.vcxproj", exePath);
-
-		if (GetFileAttributesW(devCheckPath) != INVALID_FILE_ATTRIBUTES) {
-			WCHAR projectPath[MAX_PATH] = { 0 };
-			swprintf_s(projectPath, MAX_PATH, L"%s\\..\\..\\Minecraft.Client", exePath);
-			SetCurrentDirectoryW(projectPath);
-		}
-		else {
-			SetCurrentDirectoryW(exePath);
-		}
-	}
-
 	// Declare DPI awareness so GetSystemMetrics returns physical pixels
 	SetProcessDPIAware();
 	g_iScreenWidth = GetSystemMetrics(SM_CXSCREEN);
@@ -1054,7 +1034,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	}
 #endif
 	MSG msg = {0};
-	while( WM_QUIT != msg.message )
+	while( WM_QUIT != msg.message && !app.m_bShutdown)
 	{
 		if( PeekMessage( &msg, NULL, 0, 0, PM_REMOVE ) )
 		{