From ce99fabe1396ed2956dc7ecb468760ef88f98765 Mon Sep 17 00:00:00 2001 From: Petr Mrázek 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/BaseProcess.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'logic/BaseProcess.cpp') diff --git a/logic/BaseProcess.cpp b/logic/BaseProcess.cpp index d0ddeb34..0403e683 100644 --- a/logic/BaseProcess.cpp +++ b/logic/BaseProcess.cpp @@ -120,7 +120,7 @@ void BaseProcess::init() connect(this, SIGNAL(readyReadStandardOutput()), SLOT(on_stdOut())); // Log prepost launch command output (can be disabled.) - if (m_instance->settings().get("LogPrePostOutput").toBool()) + if (m_instance->settings()->get("LogPrePostOutput").toBool()) { connect(&m_prepostlaunchprocess, &QProcess::readyReadStandardError, this, &BaseProcess::on_prepost_stdErr); @@ -285,7 +285,7 @@ void BaseProcess::killProcess() bool BaseProcess::preLaunch() { - QString prelaunch_cmd = m_instance->settings().get("PreLaunchCommand").toString(); + QString prelaunch_cmd = m_instance->settings()->get("PreLaunchCommand").toString(); if (!prelaunch_cmd.isEmpty()) { prelaunch_cmd = substituteVariables(prelaunch_cmd); @@ -330,7 +330,7 @@ bool BaseProcess::preLaunch() } bool BaseProcess::postLaunch() { - QString postlaunch_cmd = m_instance->settings().get("PostExitCommand").toString(); + QString postlaunch_cmd = m_instance->settings()->get("PostExitCommand").toString(); if (!postlaunch_cmd.isEmpty()) { postlaunch_cmd = substituteVariables(postlaunch_cmd); -- cgit