diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-01-12 22:17:14 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-01-12 22:17:14 +0100 |
| commit | b589a12d1765f8df616779c53e614adef2e4c48e (patch) | |
| tree | 83cdd87d532a36df1177987547c57058fd4f1777 /logic/BaseInstance.cpp | |
| parent | 498520446fcd10003226822f5ada9c2fe90e8c63 (diff) | |
| parent | fca4441229808891f460d5fbc4affd51e8896aa5 (diff) | |
| download | MultiMC-b589a12d1765f8df616779c53e614adef2e4c48e.tar MultiMC-b589a12d1765f8df616779c53e614adef2e4c48e.tar.gz MultiMC-b589a12d1765f8df616779c53e614adef2e4c48e.tar.lz MultiMC-b589a12d1765f8df616779c53e614adef2e4c48e.tar.xz MultiMC-b589a12d1765f8df616779c53e614adef2e4c48e.zip | |
Merge branch 'feature_better_launch' into develop
Diffstat (limited to 'logic/BaseInstance.cpp')
| -rw-r--r-- | logic/BaseInstance.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp index ac66a8d5..4fc6b9dc 100644 --- a/logic/BaseInstance.cpp +++ b/logic/BaseInstance.cpp @@ -26,6 +26,7 @@ #include "overridesetting.h" #include "pathutils.h" +#include <cmdutils.h> #include "lists/MinecraftVersionList.h" #include "logic/icons/IconList.h" @@ -248,8 +249,14 @@ void BaseInstance::setName(QString val) d->m_settings->set("name", val); emit propertiesChanged(this); } + QString BaseInstance::name() const { I_D(BaseInstance); return d->m_settings->get("name").toString(); } + +QStringList BaseInstance::extraArguments() const +{ + return Util::Commandline::splitArgs(settings().get("JvmArgs").toString()); +} |