Merge branch 'feature_better_launch' into develop

2014-01-12 23:56:19 +01:00
parent 54a9ee5eb0 afd1778fd7
commit 85ff1657fd
5 changed files with 11 additions and 3 deletions
--- a/logic/MinecraftProcess.cpp
+++ b/logic/MinecraftProcess.cpp
@ -203,7 +203,7 @@ void MinecraftProcess::launch()
 		// OSX dock icon and name
 		#ifdef OSX
 		args << "-Xdock:icon=icon.png";
-		args << QString("-Xdock:name=\"%1\"").arg(windowTitle);
+		args << QString("-Xdock:name=\"%1\"").arg(m_instance->windowTitle());
 		#endif

 		// HACK: Stupid hack for Intel drivers. See: https://mojang.atlassian.net/browse/MCL-767