зеркало из https://github.com/mozilla/gecko-dev.git
Bug 766494 Followup to bug 278860 to check for the actual missing profile folder r=bsmedberg
This commit is contained in:
Родитель
20b73453ed
Коммит
026e29eb7e
|
@ -84,7 +84,7 @@ function acceptDialog()
|
|||
profileLock = selectedProfile.profile.lock({ value: null });
|
||||
}
|
||||
catch (e) {
|
||||
if (!selectedProfile.profile.localDir.exists()) {
|
||||
if (!selectedProfile.profile.rootDir.exists()) {
|
||||
var missingTitle = gProfileManagerBundle.getString("profileMissingTitle");
|
||||
var missing =
|
||||
gProfileManagerBundle.getFormattedString("profileMissing", [appName]);
|
||||
|
|
|
@ -1797,16 +1797,16 @@ ProfileLockedDialog(nsIToolkitProfile* aProfile, nsIProfileUnlocker* aUnlocker,
|
|||
nsresult rv = aProfile->GetRootDir(getter_AddRefs(profileDir));
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
nsCOMPtr<nsIFile> profileLocalDir;
|
||||
rv = aProfile->GetLocalDir(getter_AddRefs(profileLocalDir));
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
bool exists;
|
||||
profileLocalDir->Exists(&exists);
|
||||
profileDir->Exists(&exists);
|
||||
if (!exists) {
|
||||
return ProfileMissingDialog(aNative);
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIFile> profileLocalDir;
|
||||
rv = aProfile->GetLocalDir(getter_AddRefs(profileLocalDir));
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
return ProfileLockedDialog(profileDir, profileLocalDir, aUnlocker, aNative,
|
||||
aResult);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче