diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-07-04 20:02:43 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-07-04 20:02:43 +0200 |
| commit | 526a511f455234152ca9b5bc8c60d3c82cbfa417 (patch) | |
| tree | dfc64e8d84fff503f646e7422d6b7939475a6dca /application/ConsoleWindow.cpp | |
| parent | 5628d3d379785c9c6f4a595c70392d9b1e9ea4df (diff) | |
| download | MultiMC-526a511f455234152ca9b5bc8c60d3c82cbfa417.tar MultiMC-526a511f455234152ca9b5bc8c60d3c82cbfa417.tar.gz MultiMC-526a511f455234152ca9b5bc8c60d3c82cbfa417.tar.lz MultiMC-526a511f455234152ca9b5bc8c60d3c82cbfa417.tar.xz MultiMC-526a511f455234152ca9b5bc8c60d3c82cbfa417.zip | |
GH-1053 move instance update into the launch task (BaseLauncher)
Diffstat (limited to 'application/ConsoleWindow.cpp')
| -rw-r--r-- | application/ConsoleWindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/application/ConsoleWindow.cpp b/application/ConsoleWindow.cpp index 6a3cd6b2..98492414 100644 --- a/application/ConsoleWindow.cpp +++ b/application/ConsoleWindow.cpp @@ -53,7 +53,7 @@ private: BasePage * m_log_page; }; -ConsoleWindow::ConsoleWindow(BaseLauncher *process, QWidget *parent) +ConsoleWindow::ConsoleWindow(std::shared_ptr<BaseLauncher> process, QWidget *parent) : QMainWindow(parent), m_proc(process) { MultiMCPlatform::fixWM_CLASS(this); @@ -129,11 +129,11 @@ ConsoleWindow::ConsoleWindow(BaseLauncher *process, QWidget *parent) } // Set up signal connections - connect(m_proc, SIGNAL(ended(InstancePtr, int, QProcess::ExitStatus)), this, + connect(m_proc.get(), SIGNAL(ended(InstancePtr, int, QProcess::ExitStatus)), this, SLOT(onEnded(InstancePtr, int, QProcess::ExitStatus))); - connect(m_proc, SIGNAL(prelaunch_failed(InstancePtr, int, QProcess::ExitStatus)), this, + connect(m_proc.get(), SIGNAL(prelaunch_failed(InstancePtr, int, QProcess::ExitStatus)), this, SLOT(onEnded(InstancePtr, int, QProcess::ExitStatus))); - connect(m_proc, SIGNAL(launch_failed(InstancePtr)), this, + connect(m_proc.get(), SIGNAL(launch_failed(InstancePtr)), this, SLOT(onLaunchFailed(InstancePtr))); setMayClose(false); |