diff options
author | Petr Mrázek <peterix@gmail.com> | 2014-05-18 19:07:01 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2014-05-18 19:07:01 +0200 |
commit | 911ac19a56fa1a5f8dd4798385022813cd0b9d07 (patch) | |
tree | 607971d32b1c6e18bb5d6570800fa7e3bd11878d /logic/OneSixInstance.cpp | |
parent | 7f2a16917e347db2ffcdd5a148feda71f6f3a47e (diff) | |
download | MultiMC-911ac19a56fa1a5f8dd4798385022813cd0b9d07.tar MultiMC-911ac19a56fa1a5f8dd4798385022813cd0b9d07.tar.gz MultiMC-911ac19a56fa1a5f8dd4798385022813cd0b9d07.tar.lz MultiMC-911ac19a56fa1a5f8dd4798385022813cd0b9d07.tar.xz MultiMC-911ac19a56fa1a5f8dd4798385022813cd0b9d07.zip |
Screenshot upload dialog(s) now have the console window as parent.
Diffstat (limited to 'logic/OneSixInstance.cpp')
-rw-r--r-- | logic/OneSixInstance.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp index 24d54446..6f3018cb 100644 --- a/logic/OneSixInstance.cpp +++ b/logic/OneSixInstance.cpp @@ -189,7 +189,7 @@ QStringList OneSixInstance::processMinecraftArgs(AuthSessionPtr session) return parts; } -MinecraftProcess *OneSixInstance::prepareForLaunch(AuthSessionPtr session) +bool OneSixInstance::prepareForLaunch(AuthSessionPtr account, QString &launchScript) { I_D(OneSixInstance); @@ -200,7 +200,6 @@ MinecraftProcess *OneSixInstance::prepareForLaunch(AuthSessionPtr session) auto version = d->version; if (!version) return nullptr; - QString launchScript; { auto libs = version->getActiveNormalLibs(); for (auto lib : libs) @@ -212,7 +211,7 @@ MinecraftProcess *OneSixInstance::prepareForLaunch(AuthSessionPtr session) } launchScript += "mainClass " + version->mainClass + "\n"; - for (auto param : processMinecraftArgs(session)) + for (auto param : processMinecraftArgs(account)) { launchScript += "param " + param + "\n"; } @@ -240,13 +239,7 @@ MinecraftProcess *OneSixInstance::prepareForLaunch(AuthSessionPtr session) } launchScript += "natives " + natives_dir.absolutePath() + "\n"; launchScript += "launcher onesix\n"; - - // create the process and set its parameters - MinecraftProcess *proc = new MinecraftProcess(this); - proc->setWorkdir(minecraftRoot()); - proc->setLaunchScript(launchScript); - // proc->setNativeFolder(natives_dir.absolutePath()); - return proc; + return true; } void OneSixInstance::cleanupAfterRun() |