From: skeezix <skeezix@flotsam-vm.(none)>
Date: Sat, 6 Mar 2010 04:31:05 +0000 (-0500)
Subject: Only merge overrides if the caller specifies override searchpath
X-Git-Tag: Release-2010-05/1~79
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14dd63bf5d7db220457903234056e882b6ecd711;p=pandora-libraries.git

Only merge overrides if the caller specifies override searchpath
---

diff --git a/lib/pnd_discovery.c b/lib/pnd_discovery.c
index d32a591..4087086 100644
--- a/lib/pnd_discovery.c
+++ b/lib/pnd_discovery.c
@@ -173,7 +173,9 @@ static int pnd_disco_callback ( const char *fpath, const struct stat *sb,
     }
 
     // look for any overrides, if requested
-    pnd_pxml_merge_override ( pxmlh, disco_overrides );
+    if ( disco_overrides ) {
+      pnd_pxml_merge_override ( pxmlh, disco_overrides );
+    }
 
     // check for validity and add to resultset if it looks executable
     if ( pnd_is_pxml_valid_app ( pxmlh ) ) {