From 128e615ccc7c535711e316018c2a1a9f8c8dcc12 Mon Sep 17 00:00:00 2001
From: ac-stef <ac_stef@users.sf.net>
Date: Sun, 21 Sep 2014 21:19:03 +0200
Subject: [PATCH] fix directory search order

also clarify some log output
(thx grenadier)
---
 source/src/stream.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/source/src/stream.cpp b/source/src/stream.cpp
index 2e890a11..4fba3c35 100644
--- a/source/src/stream.cpp
+++ b/source/src/stream.cpp
@@ -192,12 +192,11 @@ void sethomedir(const char *dir)
     }
 #endif
 
-#ifndef STANDALONE
-    clientlogf("Using home directory: %s", tmpdir);
-#endif
-
     if(fixpackagedir(tmpdir) > 0)
     {
+#ifndef STANDALONE
+        clientlogf("Using home directory: %s", tmpdir);
+#endif
         copystring(homedir, tmpdir);
         createdir(homedir);
     }
@@ -205,20 +204,22 @@ void sethomedir(const char *dir)
 
 void addpackagedir(const char *dir)
 {
-#ifndef STANDALONE
-    clientlogf("Adding package directory: %s", dir);
-#endif
-
     string pdir;
     copystring(pdir, dir);
-    if(fixpackagedir(pdir) > 0) packagedirs.add(newstring(pdir));
+    if(fixpackagedir(pdir) > 0)
+    {
+#ifndef STANDALONE
+        clientlogf("Adding package directory: %s", pdir);
+#endif
+        packagedirs.add(newstring(pdir));
+    }
 }
 
 const char *findfile(const char *filename, const char *mode)
 {
     static string s;
     formatstring(s)("%s%s", homedir, filename);         // homedir may be ""
-    if(fileexists(s, mode)) return s;
+    if(homedir[0] && fileexists(s, mode)) return s;
     if(mode[0]=='w' || mode[0]=='a')
     { // create missing directories, if necessary
         string dirs;