Merge pull request #170 from dragotin/master

Fix: Check if desktop file from first argument really exists
This commit is contained in:
TheAssassin
2017-10-28 22:59:56 +02:00
committed by GitHub
+6
View File
@@ -88,6 +88,12 @@ int main(int argc, char **argv)
* to do when using linuxdeployqt. */ * to do when using linuxdeployqt. */
if (firstArgument.endsWith(".desktop")){ if (firstArgument.endsWith(".desktop")){
qDebug() << "Desktop file as first argument:" << firstArgument; qDebug() << "Desktop file as first argument:" << firstArgument;
/* Check if the desktop file really exists */
if (! QFile::exists(firstArgument)) {
LogError() << "Desktop file in first argument does not exist!";
return 1;
}
QSettings * settings = 0; QSettings * settings = 0;
settings = new QSettings(firstArgument, QSettings::IniFormat); settings = new QSettings(firstArgument, QSettings::IniFormat);
desktopExecEntry = settings->value("Desktop Entry/Exec", "r").toString().split(' ').first().split('/').last().trimmed(); desktopExecEntry = settings->value("Desktop Entry/Exec", "r").toString().split(' ').first().split('/').last().trimmed();