Bug 180951 - profile directory never changes on profile switch. r=kaie/sr=alecf
git-svn-id: svn://10.0.0.236/trunk@134331 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
337ea6f743
commit
c8789fae6c
@ -113,11 +113,19 @@ nsProfileDirServiceProvider::~nsProfileDirServiceProvider()
|
||||
nsresult
|
||||
nsProfileDirServiceProvider::SetProfileDir(nsIFile* aProfileDir)
|
||||
{
|
||||
mProfileDir = aProfileDir;
|
||||
if (!aProfileDir) {
|
||||
return UndefineFileLocations();
|
||||
if (mProfileDir) {
|
||||
PRBool isEqual;
|
||||
if (aProfileDir &&
|
||||
NS_SUCCEEDED(aProfileDir->Equals(mProfileDir, &isEqual)) && isEqual) {
|
||||
NS_WARNING("Setting profile dir to same as current");
|
||||
return NS_OK;
|
||||
}
|
||||
UndefineFileLocations();
|
||||
}
|
||||
|
||||
mProfileDir = aProfileDir;
|
||||
if (!mProfileDir)
|
||||
return NS_OK;
|
||||
|
||||
nsresult rv = InitProfileDir(mProfileDir);
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user