From ce99fabe1396ed2956dc7ecb468760ef88f98765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 23 May 2015 16:07:47 +0200 Subject: GH-992 Add a transaction/locking mechanism to settings objects This can cut the FTB loading by ~66% - worth it, but not ideal. Real solution will have to be implemented later. --- logic/BaseInstance.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'logic/BaseInstance.cpp') diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp index e048f475..661e4587 100644 --- a/logic/BaseInstance.cpp +++ b/logic/BaseInstance.cpp @@ -95,9 +95,9 @@ InstancePtr BaseInstance::getSharedPtr() return shared_from_this(); } -SettingsObject &BaseInstance::settings() const +SettingsObjectPtr BaseInstance::settings() const { - return *m_settings; + return m_settings; } BaseInstance::InstanceFlags BaseInstance::flags() const @@ -212,5 +212,5 @@ QString BaseInstance::windowTitle() const QStringList BaseInstance::extraArguments() const { - return Util::Commandline::splitArgs(settings().get("JvmArgs").toString()); + return Util::Commandline::splitArgs(settings()->get("JvmArgs").toString()); } -- cgit v1.2.3