diff options
author | Petr Mrázek <peterix@gmail.com> | 2019-04-07 23:59:04 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2019-04-07 23:59:04 +0200 |
commit | 70ed30f9e6b47fbfb3151078ca61a2bb419feccb (patch) | |
tree | 0849ab3776d3e716285f3186b4e8e21ee246ee21 /application/pages | |
parent | 414946cad94affccddfa500056c6eeb967438643 (diff) | |
download | MultiMC-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.tar MultiMC-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.tar.gz MultiMC-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.tar.lz MultiMC-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.tar.xz MultiMC-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.zip |
GH-2591 less std::shared_ptr and more shared_qobject_ptr
This eliminates some weird crashes.
Diffstat (limited to 'application/pages')
-rw-r--r-- | application/pages/instance/LogPage.cpp | 4 | ||||
-rw-r--r-- | application/pages/instance/LogPage.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/application/pages/instance/LogPage.cpp b/application/pages/instance/LogPage.cpp index 0e480a3a..94ada424 100644 --- a/application/pages/instance/LogPage.cpp +++ b/application/pages/instance/LogPage.cpp @@ -192,7 +192,7 @@ void LogPage::UIToModelState() m_model->suspend(ui->trackLogCheckbox->checkState() != Qt::Checked); } -void LogPage::setInstanceLaunchTaskChanged(std::shared_ptr<LaunchTask> proc, bool initial) +void LogPage::setInstanceLaunchTaskChanged(shared_qobject_ptr<LaunchTask> proc, bool initial) { m_process = proc; if(m_process) @@ -215,7 +215,7 @@ void LogPage::setInstanceLaunchTaskChanged(std::shared_ptr<LaunchTask> proc, boo } } -void LogPage::onInstanceLaunchTaskChanged(std::shared_ptr<LaunchTask> proc) +void LogPage::onInstanceLaunchTaskChanged(shared_qobject_ptr<LaunchTask> proc) { setInstanceLaunchTaskChanged(proc, false); } diff --git a/application/pages/instance/LogPage.h b/application/pages/instance/LogPage.h index 34ed210a..9c3b56a9 100644 --- a/application/pages/instance/LogPage.h +++ b/application/pages/instance/LogPage.h @@ -69,17 +69,17 @@ private slots: void findNextActivated(); void findPreviousActivated(); - void onInstanceLaunchTaskChanged(std::shared_ptr<LaunchTask> proc); + void onInstanceLaunchTaskChanged(shared_qobject_ptr<LaunchTask> proc); private: void modelStateToUI(); void UIToModelState(); - void setInstanceLaunchTaskChanged(std::shared_ptr<LaunchTask> proc, bool initial); + void setInstanceLaunchTaskChanged(shared_qobject_ptr<LaunchTask> proc, bool initial); private: Ui::LogPage *ui; InstancePtr m_instance; - std::shared_ptr<LaunchTask> m_process; + shared_qobject_ptr<LaunchTask> m_process; LogFormatProxyModel * m_proxy; shared_qobject_ptr <LogModel> m_model; |