From b1c64c165eb7e498f6cfed65e2d439d86f21a116 Mon Sep 17 00:00:00 2001
From: David Edmundson <david@davidedmundson.co.uk>
Date: Wed, 18 May 2016 01:47:51 +0100
Subject: Avoid skipping KAuthorized check

Previously, if a .desktop file had a TryExec and a X-KDE-AuthorizeAction
entry we would skip the KAuthorized check. This is clearly wrong.

REVIEW: 127948
---
 src/core/kdesktopfile.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/core/kdesktopfile.cpp b/src/core/kdesktopfile.cpp
index eda7c292..4a550302 100644
--- a/src/core/kdesktopfile.cpp
+++ b/src/core/kdesktopfile.cpp
@@ -281,9 +281,12 @@ bool KDesktopFile::tryExec() const
     QString te = d->desktopGroup.readEntry("TryExec", QString());
 
     if (!te.isEmpty()) {
-        return !QStandardPaths::findExecutable(te).isEmpty();
+        if (QStandardPaths::findExecutable(te).isEmpty()) {
+            return false;
+        }
     }
     const QStringList list = d->desktopGroup.readEntry("X-KDE-AuthorizeAction", QStringList());
+
     if (!list.isEmpty()) {
         for (QStringList::ConstIterator it = list.begin();
                 it != list.end();
-- 
cgit v1.2.1