From a8403fe8d7b6be22f4fa5bca34bc7128cdbf117f Mon Sep 17 00:00:00 2001
From: "mcmullen%netscape.com"
 <mcmullen%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 3 May 1999 20:27:44 +0000
Subject: [PATCH] Bullet-proofing for bug #5576 (make sure profile directory is
 always initialized)

git-svn-id: svn://10.0.0.236/trunk@29974 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpfe/appshell/src/nsFileLocations.cpp | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/mozilla/xpfe/appshell/src/nsFileLocations.cpp b/mozilla/xpfe/appshell/src/nsFileLocations.cpp
index d0f26e9913b..d0355004776 100644
--- a/mozilla/xpfe/appshell/src/nsFileLocations.cpp
+++ b/mozilla/xpfe/appshell/src/nsFileLocations.cpp
@@ -117,7 +117,7 @@ static void GetProfileDirectory(nsFileSpec& outSpec)
     {
         // First time, initialize gProfileDir
         nsIProfile *profileService = nsnull;
-        gProfileDir = new nsFileSpec;
+        gProfileDir = new nsFileSpec("Default");
         if (!gProfileDir)
             return;
         nsresult rv = nsServiceManager::GetService(
@@ -128,6 +128,7 @@ static void GetProfileDirectory(nsFileSpec& outSpec)
         {
             char* currProfileName = nsnull;
             nsFileSpec currProfileDirSpec;
+	        CreateDefaultProfileDirectorySpec(currProfileDirSpec);
             
             profileService->Startup(nsnull);
             int numProfiles = 0;
@@ -135,7 +136,6 @@ static void GetProfileDirectory(nsFileSpec& outSpec)
             if (numProfiles == 0)
             {    
 		        // no profiles exist: create "default" profile
-		        CreateDefaultProfileDirectorySpec(currProfileDirSpec);
 	            profileService->SetProfileDir("default", currProfileDirSpec);
 	            currProfileName = PL_strdup("default");
 	        }
@@ -236,31 +236,31 @@ void nsSpecialFileSpec::operator = (Type aType)
         
         case App_ComponentsDirectory:
             {
-                nsSpecialSystemDirectory dir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
+                *this = nsSpecialSystemDirectory(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
 #ifdef XP_MAC
-                dir += "Components";
+                *this += "Components";
 #else
-                dir += "components";
+                *this += "components";
 #endif
             }
             break;
 		case App_ChromeDirectory:
             {
-                nsSpecialSystemDirectory dir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
+                *this = nsSpecialSystemDirectory(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
 #ifdef XP_MAC
-                dir += "Chrome";
+                *this += "Chrome";
 #else
-                dir += "chrome";
+                *this += "chrome";
 #endif
             }
             break;
 		case App_PluginsDirectory:
             {
-                nsSpecialSystemDirectory dir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
+                *this = nsSpecialSystemDirectory(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
 #ifdef XP_MAC
-                dir += "Chrome";
+                *this += "Plugins";
 #else
-                dir += "plugins";
+                *this += "plugins";
 #endif
             }
             break;