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 /api/logic/BaseInstance.cpp | |
| 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 'api/logic/BaseInstance.cpp')
| -rw-r--r-- | api/logic/BaseInstance.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/api/logic/BaseInstance.cpp b/api/logic/BaseInstance.cpp index 469d0d9f..7a95e255 100644 --- a/api/logic/BaseInstance.cpp +++ b/api/logic/BaseInstance.cpp @@ -175,11 +175,6 @@ QString BaseInstance::instanceRoot() const return m_rootDir; } -InstancePtr BaseInstance::getSharedPtr() -{ - return shared_from_this(); -} - SettingsObjectPtr BaseInstance::settings() const { return m_settings; @@ -253,7 +248,7 @@ QStringList BaseInstance::extraArguments() const return Commandline::splitArgs(settings()->get("JvmArgs").toString()); } -std::shared_ptr<LaunchTask> BaseInstance::getLaunchTask() +shared_qobject_ptr<LaunchTask> BaseInstance::getLaunchTask() { return m_launchProcess; } |