diff options
Diffstat (limited to 'src/main-lib/configuration.cpp')
| -rw-r--r-- | src/main-lib/configuration.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main-lib/configuration.cpp b/src/main-lib/configuration.cpp index 385abc07..e1cce45f 100644 --- a/src/main-lib/configuration.cpp +++ b/src/main-lib/configuration.cpp @@ -313,7 +313,7 @@ void Configuration::parseWithArguments(const QStringList &arguments) try { cache.parse(); m_data.reset(cache.takeMergedResult()); - if (m_data.isNull()) + if (!m_data) m_data.reset(new ConfigurationData()); } catch (const Exception &e) { showParserMessage(e.errorString() + qL1C('\n'), ErrorMessage); @@ -330,7 +330,7 @@ void Configuration::parseWithArguments(const QStringList &arguments) try { ConfigurationData *cd = ConfigCacheAdaptor<ConfigurationData>::loadFromSource(&buffer, qSL("command line")); if (cd) { - ConfigCacheAdaptor<ConfigurationData>::merge(m_data.data(), cd); + ConfigCacheAdaptor<ConfigurationData>::merge(m_data.get(), cd); delete cd; } } catch (const Exception &e) { |