aboutsummaryrefslogtreecommitdiff
path: root/application/InstanceWindow.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2019-04-07 23:59:04 +0200
committerPetr Mrázek <peterix@gmail.com>2019-04-07 23:59:04 +0200
commit70ed30f9e6b47fbfb3151078ca61a2bb419feccb (patch)
tree0849ab3776d3e716285f3186b4e8e21ee246ee21 /application/InstanceWindow.h
parent414946cad94affccddfa500056c6eeb967438643 (diff)
downloadPrismLauncher-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.tar.gz
PrismLauncher-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.tar.bz2
PrismLauncher-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.zip
GH-2591 less std::shared_ptr and more shared_qobject_ptr
This eliminates some weird crashes.
Diffstat (limited to 'application/InstanceWindow.h')
-rw-r--r--application/InstanceWindow.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/application/InstanceWindow.h b/application/InstanceWindow.h
index 792624e2..e5bd4464 100644
--- a/application/InstanceWindow.h
+++ b/application/InstanceWindow.h
@@ -52,7 +52,7 @@ slots:
void on_btnKillMinecraft_clicked();
void on_btnLaunchMinecraftOffline_clicked();
- void on_InstanceLaunchTask_changed(std::shared_ptr<LaunchTask> proc);
+ void on_InstanceLaunchTask_changed(shared_qobject_ptr<LaunchTask> proc);
void on_RunningState_changed(bool running);
void on_instanceStatusChanged(BaseInstance::Status, BaseInstance::Status newStatus);
@@ -63,7 +63,7 @@ private:
void updateLaunchButtons();
private:
- std::shared_ptr<LaunchTask> m_proc;
+ shared_qobject_ptr<LaunchTask> m_proc;
InstancePtr m_instance;
bool m_doNotSave = false;
PageContainer *m_container = nullptr;