status-im
/
snorenotify
mirror of https://github.com/status-im/snorenotify.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

dont creash if there are no plugins

This commit is contained in:
Patrick von Reth 2014-07-24 15:38:04 +02:00
parent b7022a158b
commit 5e68fd84cf
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/plugins/plugincontainer.cpp
View File

@ -178,9 +178,11 @@ const QHash<QString, PluginContainer *> PluginContainer::pluginCache(SnorePlugin
const QDir &PluginContainer::pluginDir()
{
static QDir *path = NULL;
if(path == NULL)
static bool isLoaded = false;
static QDir path;
if(!isLoaded)
{
isLoaded = true;
QString appDir = qApp->applicationDirPath();
QStringList list;
#ifdef Q_OS_MAC
@ -202,22 +204,24 @@ const QDir &PluginContainer::pluginDir()
<< QLatin1String(LIBSNORE_PLUGIN_PATH);
foreach(const QString &p, list)
{
QDir dir(p);
path = QDir(p);
if(!dir.entryInfoList(pluginFileFilters()).isEmpty())
if(!path.entryInfoList(pluginFileFilters()).isEmpty())
{
path = new QDir(dir);
break;
}
else
{
snoreDebug( SNORE_DEBUG ) << "Possible pluginpath:" << dir.absolutePath() << "does not contain plugins.";
snoreDebug( SNORE_DEBUG ) << "Possible pluginpath:" << path.absolutePath() << "does not contain plugins.";
}
}
Q_ASSERT_X(path != NULL, Q_FUNC_INFO, "Failed to find a plugin dir");
snoreDebug( SNORE_INFO ) << "PluginPath is :" << path->absolutePath();
if(path.entryInfoList(pluginFileFilters()).isEmpty())
{
snoreDebug( SNORE_WARNING ) << "Couldnt find any plugins";
}
snoreDebug( SNORE_INFO ) << "PluginPath is :" << path.absolutePath();
}
return *path;
return path;
}