Fixed #742: cache reset to default button doesn't work (introduced in 7507619e)

1 files changed, 2 insertions, 2 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 2fab25b..1b32581 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -2991,7 +2991,7 @@ bool LLAppViewer::initCache()
                 cache_location = gSavedSettings.getString("CacheLocation");
         }
         std::string new_cache_location = gSavedSettings.getString("NewCacheLocation");
-        if ((new_cache_location != cache_location) && new_cache_location != "")
+        if (new_cache_location != cache_location)
         {
                 gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation"));
                 purgeCache(); // purge old cache
@@ -2999,7 +2999,7 @@ bool LLAppViewer::initCache()
                 cache_location = new_cache_location;
         }
         
-        if (!gDirUtilp->setCacheDir(cache_location))
+        if (!gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation")))
         {
                 LL_WARNS("AppCache") << "Unable to set cache location" << LL_ENDL;
                 gSavedSettings.setString("CacheLocation", "");