From 70ed30f9e6b47fbfb3151078ca61a2bb419feccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 7 Apr 2019 23:59:04 +0200 Subject: GH-2591 less std::shared_ptr and more shared_qobject_ptr This eliminates some weird crashes. --- api/logic/BaseInstance.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'api/logic/BaseInstance.cpp') 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 BaseInstance::getLaunchTask() +shared_qobject_ptr BaseInstance::getLaunchTask() { return m_launchProcess; } -- cgit v1.2.3