diff options
| author | LostDragonist <lost.dragonist@gmail.com> | 2018-12-12 20:26:35 -0600 |
|---|---|---|
| committer | LostDragonist <lost.dragonist@gmail.com> | 2018-12-12 20:35:23 -0600 |
| commit | 4436d376a8d426867f217b03838570a424b09c5f (patch) | |
| tree | 8afa85ec70e2bb571304088806d8b78686e06f50 /src/settings.cpp | |
| parent | 40c82fc1908a8ca53abeeabdc618e81e941c987c (diff) | |
Clean up and fix merge issues
Diffstat (limited to 'src/settings.cpp')
| -rw-r--r-- | src/settings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/settings.cpp b/src/settings.cpp index eb5b372f..74c95ebf 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -476,7 +476,7 @@ uint Settings::getMotDHash() const bool Settings::archiveParsing() const { - return m_Settings.value("Settings/archive_parsing", true).toBool(); + return m_Settings.value("Settings/archive_parsing", true).toBool(); } QVariant Settings::pluginSetting(const QString &pluginName, const QString &key) const @@ -1126,7 +1126,7 @@ Settings::WorkaroundsTab::WorkaroundsTab(Settings *m_parent, m_displayForeignBox->setChecked(m_parent->displayForeign()); m_lockGUIBox->setChecked(m_parent->lockGUI()); m_enableArchiveParsingBox->setChecked(m_parent->archiveParsing()); - + m_dialog.setExecutableBlacklist(m_parent->executablesBlacklist()); } |