refs #884 Fixed some settings usage in CApplication.

This commit is contained in:
Mathew Sutcliffe
2017-03-01 12:42:39 +00:00
parent 53fc629490
commit 220c237b8c

View File

@@ -485,7 +485,11 @@ namespace BlackCore
QStringList CApplication::getAllUnsavedSettings() const QStringList CApplication::getAllUnsavedSettings() const
{ {
return CSettingsCache::instance()->getAllUnsavedKeys(); if (this->supportsContexts())
{
return this->getIContextApplication()->getUnsavedSettingsKeys();
}
return {};
} }
CStatusMessage CApplication::saveSettingsByKey(const QStringList &keys) CStatusMessage CApplication::saveSettingsByKey(const QStringList &keys)
@@ -495,10 +499,10 @@ namespace BlackCore
{ {
return this->getIContextApplication()->saveSettingsByKey(keys); return this->getIContextApplication()->saveSettingsByKey(keys);
} }
else //! \todo If contexts have shut down then we already missed the opportunity to save settings.
{ //! Saving without contexts is not safe.
return CSettingsCache::instance()->saveToStore(keys); BLACK_VERIFY(false);
} return CSettingsCache::instance()->saveToStore(keys);
} }
QString CApplication::getTemporaryDirectory() const QString CApplication::getTemporaryDirectory() const