From 7831640cf994a466dafb36eaf55acdf35dc457b2 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Tue, 1 May 2012 20:26:06 +0200
Subject: fix extension path scan (Bug #801568 ; patch of Patrick Monnerat)

(bzr r11312)
---
 src/extension/dependency.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/extension/dependency.cpp')

diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp
index e4073a00b..9490381c0 100644
--- a/src/extension/dependency.cpp
+++ b/src/extension/dependency.cpp
@@ -181,14 +181,12 @@ Dependency::check (void) const
                         /* Not sure whether this is UTF8 happy, but it would seem
                            like it considering that I'm searching (and finding)
                            the ':' character */
-                        if (path != local_path && path != NULL) {
+                        if (path != NULL) {
                             path[0] = '\0';
                             path++;
-                        } else {
-                            path = NULL;
                         }
 
-                        if (local_path == '\0') {
+                        if (*local_path == '\0') {
                             final_name = g_strdup(_string);
                         } else {
                             final_name = g_build_filename(local_path, _string, NULL);
-- 
cgit v1.2.3