summaryrefslogtreecommitdiffstats
path: root/application/pages/global/ProxyPage.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-05-25 08:21:35 +0200
committerPetr Mrázek <peterix@gmail.com>2015-05-25 08:21:35 +0200
commit8fb5d4add3cbbd5a4c1d4cd32ddab67fda458afa (patch)
tree6bc748a8977b3411dc805344c6f5417779b174b0 /application/pages/global/ProxyPage.cpp
parent185ff238c202f3db20f013cd18cfbd99c9878e8e (diff)
downloadMultiMC-8fb5d4add3cbbd5a4c1d4cd32ddab67fda458afa.tar
MultiMC-8fb5d4add3cbbd5a4c1d4cd32ddab67fda458afa.tar.gz
MultiMC-8fb5d4add3cbbd5a4c1d4cd32ddab67fda458afa.tar.lz
MultiMC-8fb5d4add3cbbd5a4c1d4cd32ddab67fda458afa.tar.xz
MultiMC-8fb5d4add3cbbd5a4c1d4cd32ddab67fda458afa.zip
GH-1003 add some save locking for dialog pages that deal with settings
Diffstat (limited to 'application/pages/global/ProxyPage.cpp')
-rw-r--r--application/pages/global/ProxyPage.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/application/pages/global/ProxyPage.cpp b/application/pages/global/ProxyPage.cpp
index f18f7049..f998fb4b 100644
--- a/application/pages/global/ProxyPage.cpp
+++ b/application/pages/global/ProxyPage.cpp
@@ -57,6 +57,8 @@ void ProxyPage::applySettings()
{
auto s = MMC->settings();
+ SettingsObject::Lock lock(s);
+
// Proxy
QString proxyType = "None";
if (ui->proxyDefaultBtn->isChecked())