diff options
author | Ken Moore <moorekou@gmail.com> | 2015-10-29 12:38:14 -0400 |
---|---|---|
committer | Ken Moore <moorekou@gmail.com> | 2015-10-29 12:38:14 -0400 |
commit | 58f21de614ed0a7342e4ecb2bed735d79ffa6b23 (patch) | |
tree | ce2b26ba23e3d67a735f2131e89eb120f7cef634 | |
parent | Merge branch 'master' of github.com:pcbsd/lumina (diff) | |
download | lumina-58f21de614ed0a7342e4ecb2bed735d79ffa6b23.tar.gz lumina-58f21de614ed0a7342e4ecb2bed735d79ffa6b23.tar.bz2 lumina-58f21de614ed0a7342e4ecb2bed735d79ffa6b23.zip |
Make sure that lumina-open always watches files that are *not* in the XDG autostart folder(s) when opening a *.desktop file.
-rw-r--r-- | lumina-open/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lumina-open/main.cpp b/lumina-open/main.cpp index 7f92ac3e..2b44b14a 100644 --- a/lumina-open/main.cpp +++ b/lumina-open/main.cpp @@ -238,7 +238,7 @@ void getCMD(int argc, char ** argv, QString& binary, QString& args, QString& pat if(!DF.exec.isEmpty()){ cmd = LXDG::getDesktopExec(DF,ActionID); if(!DF.path.isEmpty()){ path = DF.path; } - watch = DF.startupNotify; + watch = DF.startupNotify || !DF.filePath.contains("/xdg/autostart/"); }else{ ShowErrorDialog( argc, argv, QString(QObject::tr("Application shortcut is missing the launching information (malformed shortcut): %1")).arg(inFile) ); } @@ -249,7 +249,7 @@ void getCMD(int argc, char ** argv, QString& binary, QString& args, QString& pat inFile = DF.url; cmd.clear(); extension = inFile.section(":",0,0); - watch = DF.startupNotify; + watch = DF.startupNotify || !DF.filePath.contains("/xdg/autostart/"); }else{ ShowErrorDialog( argc, argv, QString(QObject::tr("URL shortcut is missing the URL: %1")).arg(inFile) ); } @@ -260,7 +260,7 @@ void getCMD(int argc, char ** argv, QString& binary, QString& args, QString& pat inFile = DF.path; cmd.clear(); extension = "directory"; - watch = DF.startupNotify; + watch = DF.startupNotify || !DF.filePath.contains("/xdg/autostart/"); }else{ ShowErrorDialog( argc, argv, QString(QObject::tr("Directory shortcut is missing the path to the directory: %1")).arg(inFile) ); } |