[X2Go-Commits] [x2goclient] 196/267: src/x2goutils.cpp: fix faulty logic in find_binary (): only reset the given path to CWD iff it's actually empty. Not the other way around.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit f85df365ff64df7e31c8bc9e66e8cac0297903f9
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jun 22 04:51:28 2016 +0200

    src/x2goutils.cpp: fix faulty logic in find_binary (): only reset the given path to CWD iff it's actually empty. Not the other way around.
---
 debian/changelog  |    2 ++
 src/x2goutils.cpp |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e9fcfa0..4e7baa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -333,6 +333,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
       system-PA version.
     - src/pulsemanager.cpp: add warning message boxes where appropriate.
     - src/pulsemanager.cpp: remove extraneous newlines from debug output.
+    - src/x2goutils.cpp: fix faulty logic in find_binary (): only reset the
+      given path to CWD iff it's actually empty. Not the other way around.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/x2goutils.cpp b/src/x2goutils.cpp
index 25a2b54..45c31df 100644
--- a/src/x2goutils.cpp
+++ b/src/x2goutils.cpp
@@ -298,7 +298,7 @@ QString find_binary (const QString &path, const QString &binary_name) {
     QString cur_path = "";
     QString tmp_path = path;
 
-    if (!(path.isEmpty ())) {
+    if (path.isEmpty ()) {
       tmp_path = "./";
     }
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git