diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-05-23 16:07:47 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-05-23 16:07:47 +0200 |
| commit | ce99fabe1396ed2956dc7ecb468760ef88f98765 (patch) | |
| tree | 603f7c6f1a0f27805b21843ec3f829354ad0ff77 /application/pages | |
| parent | 0e0ddf5494ab4a264b0dc18c4b94809844300dc0 (diff) | |
| download | MultiMC-ce99fabe1396ed2956dc7ecb468760ef88f98765.tar MultiMC-ce99fabe1396ed2956dc7ecb468760ef88f98765.tar.gz MultiMC-ce99fabe1396ed2956dc7ecb468760ef88f98765.tar.lz MultiMC-ce99fabe1396ed2956dc7ecb468760ef88f98765.tar.xz MultiMC-ce99fabe1396ed2956dc7ecb468760ef88f98765.zip | |
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.
Diffstat (limited to 'application/pages')
| -rw-r--r-- | application/pages/InstanceSettingsPage.cpp | 2 | ||||
| -rw-r--r-- | application/pages/InstanceSettingsPage.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/application/pages/InstanceSettingsPage.cpp b/application/pages/InstanceSettingsPage.cpp index 4fc812b2..3dc79688 100644 --- a/application/pages/InstanceSettingsPage.cpp +++ b/application/pages/InstanceSettingsPage.cpp @@ -14,7 +14,7 @@ InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent) : QWidget(parent), ui(new Ui::InstanceSettingsPage), m_instance(inst) { - m_settings = &(inst->settings()); + m_settings = inst->settings(); ui->setupUi(this); loadSettings(); } diff --git a/application/pages/InstanceSettingsPage.h b/application/pages/InstanceSettingsPage.h index 55ae69db..f85de678 100644 --- a/application/pages/InstanceSettingsPage.h +++ b/application/pages/InstanceSettingsPage.h @@ -69,6 +69,6 @@ private slots: private: Ui::InstanceSettingsPage *ui; BaseInstance *m_instance; - SettingsObject *m_settings; + SettingsObjectPtr m_settings; QObjectPtr<JavaCommon::TestCheck> checker; }; |