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.
This commit is contained in:
parent
0e0ddf5494
commit
ce99fabe13
14 changed files with 102 additions and 41 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue