diff options
author | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-02-22 18:18:23 +0100 |
---|---|---|
committer | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-02-22 18:18:23 +0100 |
commit | 3a173648e789f30b2843241ee38e694d16e10358 (patch) | |
tree | 9941f7025d8f3f5ff19c515bde8ae3ebca98a4a8 /main.cpp | |
parent | 10c707363b3f19a8862b5ebd2858bcaad1304a13 (diff) | |
download | MultiMC-3a173648e789f30b2843241ee38e694d16e10358.tar MultiMC-3a173648e789f30b2843241ee38e694d16e10358.tar.gz MultiMC-3a173648e789f30b2843241ee38e694d16e10358.tar.lz MultiMC-3a173648e789f30b2843241ee38e694d16e10358.tar.xz MultiMC-3a173648e789f30b2843241ee38e694d16e10358.zip |
Implement ConsoleWindow
Diffstat (limited to 'main.cpp')
-rw-r--r-- | main.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -24,6 +24,7 @@ #include "gui/mainwindow.h" #include "gui/logindialog.h" #include "gui/taskdialog.h" +#include "gui/consolewindow.h" #include "instancelist.h" #include "appsettings.h" @@ -49,6 +50,7 @@ private: QString instId; InstancePtr instance; MinecraftProcess *proc; + ConsoleWindow *console; public: InstanceLauncher(QString instId) : QObject(), instances(settings->getInstanceDir()) { @@ -82,15 +84,12 @@ private slots: void onLoginComplete(LoginResponse response) { // TODO: console - proc = new MinecraftProcess(instance, response.getUsername(), response.getSessionID(), nullptr); + console = new ConsoleWindow(); + proc = new MinecraftProcess(instance, response.getUsername(), response.getSessionID(), console); + //if (instance->getShowConsole()) + console->show(); connect(proc, SIGNAL(ended()), SLOT(onTerminated())); proc->launch(); - /*if (proc->pid() == 0) - { - std::cout << "Could not start instance." << std::endl; - QApplication::instance()->quit(); - return; - }*/ } void doLogin(const QString &errorMsg) |