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. --- application/pages/InstanceSettingsPage.cpp | 2 +- application/pages/InstanceSettingsPage.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'application/pages') 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 checker; }; -- cgit v1.2.3