diff options
| author | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-02-25 22:47:03 +0100 |
|---|---|---|
| committer | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-03-22 13:56:57 +0100 |
| commit | f4c9cb8c1d395422b7e4f1c27ac92b6df08a39bb (patch) | |
| tree | 595a93410af4ff4e238d27d78b030c595915d4cc /libmultimc | |
| parent | f01bf10dc511268ead551a191a6a3211c006ba44 (diff) | |
| download | MultiMC-f4c9cb8c1d395422b7e4f1c27ac92b6df08a39bb.tar MultiMC-f4c9cb8c1d395422b7e4f1c27ac92b6df08a39bb.tar.gz MultiMC-f4c9cb8c1d395422b7e4f1c27ac92b6df08a39bb.tar.lz MultiMC-f4c9cb8c1d395422b7e4f1c27ac92b6df08a39bb.tar.xz MultiMC-f4c9cb8c1d395422b7e4f1c27ac92b6df08a39bb.zip | |
refactor indendation, fix a bug in MinecraftProcess & fix a bug in
InstanceLauncher
Diffstat (limited to 'libmultimc')
| -rw-r--r-- | libmultimc/include/minecraftprocess.h | 2 | ||||
| -rw-r--r-- | libmultimc/src/minecraftprocess.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libmultimc/include/minecraftprocess.h b/libmultimc/include/minecraftprocess.h index 8986f7ad..d6b9f612 100644 --- a/libmultimc/include/minecraftprocess.h +++ b/libmultimc/include/minecraftprocess.h @@ -85,7 +85,7 @@ protected: QStringList m_arguments; void genArgs(); - void log(QString text); + void log(QString text, ConsoleWindow::WriteMode mode = ConsoleWindow::MULTIMC); protected slots: void finish(int, QProcess::ExitStatus status); diff --git a/libmultimc/src/minecraftprocess.cpp b/libmultimc/src/minecraftprocess.cpp index 943d76b1..3aecb1ee 100644 --- a/libmultimc/src/minecraftprocess.cpp +++ b/libmultimc/src/minecraftprocess.cpp @@ -197,6 +197,8 @@ void MinecraftProcess::launch() start(m_instance->settings().get("JavaPath").toString(), m_arguments); if (!waitForStarted()) { + log("Could not launch minecraft!", ConsoleWindow::ERROR); + return; //TODO: error handling } |