Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1475282: Fix DEAD_STORE issues in ProfileReset. r=erahm

Browse Source 
MozReview-Commit-ID: 45COqLBdEze

--HG--
extra : rebase_source : 915361d1464c751c693f091cc2926661d6dbfa59
This commit is contained in:
Robert Bartlensky 2018-07-16 18:27:16 +01:00
parent b357f1861c
commit 85ef2b4c49
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolkit/xre/ProfileReset.cpp
View File

@ -21,6 +21,7 @@
#include "mozilla/XREAppData.h"
#include "mozilla/Services.h"
#include "mozilla/Unused.h"
#include "prtime.h"
using namespace mozilla;
@ -81,7 +82,7 @@ ProfileResetCleanup(nsIToolkitProfile* aOldProfile)
if (!sbs) return NS_ERROR_FAILURE;
nsCOMPtr<nsIStringBundle> sb;
rv = sbs->CreateBundle(kProfileProperties, getter_AddRefs(sb));
Unused << sbs->CreateBundle(kProfileProperties, getter_AddRefs(sb));
if (!sb) return NS_ERROR_FAILURE;
NS_ConvertUTF8toUTF16 appName(gAppData->name);
@ -92,6 +93,7 @@ ProfileResetCleanup(nsIToolkitProfile* aOldProfile)
static const char* kResetBackupDirectory = "resetBackupDirectory";
rv = sb->FormatStringFromName(kResetBackupDirectory, params, 2,
resetBackupDirectoryName);
if (NS_FAILED(rv)) return rv;
// Get info to copy the old root profile dir to the desktop as a backup.
nsCOMPtr<nsIFile> backupDest, containerDest, profileDest;