Added fallback for when XDG_DATA_DIRS is unavailable

This commit is contained in:
Carl Klemm 2020-06-16 10:06:25 +02:00
parent 872a7f2ddc
commit fd8c378cd0
2 changed files with 12 additions and 2 deletions

4
debian/changelog vendored
View File

@ -1,3 +1,7 @@
qsigstoped (1.0.2) unstable; urgency=medium
Added fallback for when XDG_DATA_DIRS is unavailable
-- Uvos <carl@uvos.xyz> Mon, 16 Jun 2020 15:00:00 +0100
qsigstoped (1.0.1) unstable; urgency=medium qsigstoped (1.0.1) unstable; urgency=medium
Inital version Inital version
-- Uvos <carl@uvos.xyz> Mon, 10 Jun 2020 15:00:00 +0100 -- Uvos <carl@uvos.xyz> Mon, 10 Jun 2020 15:00:00 +0100

View File

@ -57,10 +57,16 @@ int main(int argc, char *argv[])
pidfile.close(); pidfile.close();
} }
QList<QByteArray> desktopFileDirs = qgetenv("XDG_DATA_DIRS").split(':'); QString xdgDataDirs = qgetenv("XDG_DATA_DIRS");
if(xdgDataDirs.isEmpty())
{
qDebug()<<"XDG_DATA_DIRS not set\n";
xdgDataDirs = "/usr/local/share/:/usr/share/";
}
xdgDataDirs.remove('\"');
QList<QByteArray> desktopFileDirs = xdgDataDirs.toUtf8().split(':');
qDebug()<<"Looking for .desktop files in:"; qDebug()<<"Looking for .desktop files in:";
for(int i = 0; i < desktopFileDirs.size(); ++i) qDebug()<<QString(desktopFileDirs[i]); for(int i = 0; i < desktopFileDirs.size(); ++i) qDebug()<<QString(desktopFileDirs[i]);
if(desktopFileDirs.size() == 0) QMessageBox::critical(nullptr, "Error", "XDG_DATA_DIRS must be set" );
QFile blacklist(QDir::home().path() + "/.config/sigstoped/blacklist"); QFile blacklist(QDir::home().path() + "/.config/sigstoped/blacklist");
blacklist.open(QIODevice::ReadOnly); blacklist.open(QIODevice::ReadOnly);