Skip to content

Commit

Permalink
FIX(client): Also respect MUMBLE_PLUGIN_PATH in debug mode
Browse files Browse the repository at this point in the history
As this variable will always be set by the cmake build system the debug
code should also respect its setting.
  • Loading branch information
Krzmbrzl committed Oct 31, 2020
1 parent 705e56f commit 681779b
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/mumble/Plugins.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,13 @@ Plugins::Plugins(QObject *p) : QObject(p) {

qsUserPlugins = g.qdBasePath.absolutePath() + QLatin1String("/Plugins");
#else
qsSystemPlugins =
QString::fromLatin1("%1/plugins").arg(MumbleApplication::instance()->applicationVersionRootPath());
qsUserPlugins = QString();
# ifdef MUMBLE_PLUGIN_PATH
qsSystemPlugins = QLatin1String(MUMTEXT(MUMBLE_PLUGIN_PATH));
# else
qsSystemPlugins = QString();
# endif

qsUserPlugins = QString::fromLatin1("%1/plugins").arg(MumbleApplication::instance()->applicationVersionRootPath());
#endif

#ifdef Q_OS_WIN
Expand Down Expand Up @@ -301,12 +305,8 @@ void Plugins::rescanPlugins() {
bValid = false;

QDir qd(qsSystemPlugins, QString(), QDir::Name, QDir::Files | QDir::Readable);
#ifdef QT_NO_DEBUG
QDir qud(qsUserPlugins, QString(), QDir::Name, QDir::Files | QDir::Readable);
QFileInfoList libs = qud.entryInfoList() + qd.entryInfoList();
#else
QFileInfoList libs = qd.entryInfoList();
#endif

QSet< QString > evaluated;
foreach (const QFileInfo &libinfo, libs) {
Expand Down

0 comments on commit 681779b

Please sign in to comment.