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
|
@ -1548,7 +1548,7 @@ void MainWindow::instanceActivated(QModelIndex index)
|
|||
if (!inst)
|
||||
return;
|
||||
|
||||
JavaCommon::checkJVMArgs(inst->settings().get("JvmArgs").toString(), this);
|
||||
JavaCommon::checkJVMArgs(inst->settings()->get("JvmArgs").toString(), this);
|
||||
|
||||
doLaunch();
|
||||
}
|
||||
|
@ -1557,7 +1557,7 @@ void MainWindow::on_actionLaunchInstance_triggered()
|
|||
{
|
||||
if (m_selectedInstance)
|
||||
{
|
||||
JavaCommon::checkJVMArgs(m_selectedInstance->settings().get("JvmArgs").toString(), this);
|
||||
JavaCommon::checkJVMArgs(m_selectedInstance->settings()->get("JvmArgs").toString(), this);
|
||||
doLaunch();
|
||||
}
|
||||
}
|
||||
|
@ -1566,7 +1566,7 @@ void MainWindow::on_actionLaunchInstanceOffline_triggered()
|
|||
{
|
||||
if (m_selectedInstance)
|
||||
{
|
||||
JavaCommon::checkJVMArgs(m_selectedInstance->settings().get("JvmArgs").toString(), this);
|
||||
JavaCommon::checkJVMArgs(m_selectedInstance->settings()->get("JvmArgs").toString(), this);
|
||||
doLaunch(false);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue