Commit 6691eaa6 authored by Laurent Montel's avatar Laurent Montel 😁

Merge remote-tracking branch 'origin/Applications/18.12'

parents 18d852e2 75c06424
......@@ -65,10 +65,8 @@ KgThemeProvider::KgThemeProvider(const QByteArray& configKey, QObject* parent)
KgThemeProvider::~KgThemeProvider()
{
if (d->m_themes.isEmpty())
{
return;
}
if (!d->m_themes.isEmpty())
{
//save current theme in config file (no sync() call here; this will most
//likely be called at application shutdown when others are also writing to
//KGlobal::config(); also KConfig's dtor will sync automatically)
......@@ -83,7 +81,9 @@ KgThemeProvider::~KgThemeProvider()
while (!d->m_themes.isEmpty())
{
delete const_cast<KgTheme*>(d->m_themes.takeFirst());
}
}
delete d;
}
}
QString KgThemeProvider::name() const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment