diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-10-31 09:06:42 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-10-31 09:06:42 +0100 |
| commit | b018aab1e936dc368090987a72a929987574b1b8 (patch) | |
| tree | 95354efc7f9096cfee0cc0cfdf27d32237dacd2c /logic | |
| parent | f941119fbd89b5677a2895eee3232fa76389b4b5 (diff) | |
| parent | 8cd6604e40ae5d250f6826d0c7a1985e719ec66c (diff) | |
| download | MultiMC-b018aab1e936dc368090987a72a929987574b1b8.tar MultiMC-b018aab1e936dc368090987a72a929987574b1b8.tar.gz MultiMC-b018aab1e936dc368090987a72a929987574b1b8.tar.lz MultiMC-b018aab1e936dc368090987a72a929987574b1b8.tar.xz MultiMC-b018aab1e936dc368090987a72a929987574b1b8.zip | |
Merge branch 'develop'
Diffstat (limited to 'logic')
| -rw-r--r-- | logic/LegacyInstance.cpp | 9 | ||||
| -rw-r--r-- | logic/OneSixInstance.cpp | 13 |
2 files changed, 20 insertions, 2 deletions
diff --git a/logic/LegacyInstance.cpp b/logic/LegacyInstance.cpp index f741caad..2fd18693 100644 --- a/logic/LegacyInstance.cpp +++ b/logic/LegacyInstance.cpp @@ -74,6 +74,15 @@ MinecraftProcess *LegacyInstance::prepareForLaunch(LoginResponse response) args << QString("-Xms%1m").arg(settings().get("MinMemAlloc").toInt()); args << QString("-Xmx%1m").arg(settings().get("MaxMemAlloc").toInt()); args << QString("-XX:PermSize=%1m").arg(settings().get("PermGen").toInt()); +/** +* HACK: Stupid hack for Intel drivers. +* See: https://mojang.atlassian.net/browse/MCL-767 +*/ +#ifdef Q_OS_WIN32 + args << QString("-XX:HeapDumpPath=MojangTricksIntelDriversForPerformance_javaw.exe_" + "minecraft.exe.heapdump"); +#endif + args << "-jar" << LAUNCHER_FILE; args << response.player_name; args << response.session_id; diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp index d80f6b37..7539d8e5 100644 --- a/logic/OneSixInstance.cpp +++ b/logic/OneSixInstance.cpp @@ -119,6 +119,16 @@ MinecraftProcess *OneSixInstance::prepareForLaunch(LoginResponse response) args << QString("-Xms%1m").arg(settings().get("MinMemAlloc").toInt()); args << QString("-Xmx%1m").arg(settings().get("MaxMemAlloc").toInt()); args << QString("-XX:PermSize=%1m").arg(settings().get("PermGen").toInt()); + +/** + * HACK: Stupid hack for Intel drivers. + * See: https://mojang.atlassian.net/browse/MCL-767 + */ +#ifdef Q_OS_WIN32 + args << QString("-XX:HeapDumpPath=MojangTricksIntelDriversForPerformance_javaw.exe_" + "minecraft.exe.heapdump"); +#endif + QDir natives_dir(natives_dir_raw); args << QString("-Djava.library.path=%1").arg(natives_dir.absolutePath()); QString classPath; @@ -148,7 +158,7 @@ MinecraftProcess *OneSixInstance::prepareForLaunch(LoginResponse response) // Set the width and height for 1.6 instances bool maximize = settings().get("LaunchMaximized").toBool(); - if(maximize) + if (maximize) { // this is probably a BAD idea // args << QString("--fullscreen"); @@ -342,4 +352,3 @@ QString OneSixInstance::instanceConfigFolder() const { return PathCombine(minecraftRoot(), "config"); } - |