Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 380015 - Crash [@ nsFrame::BoxReflow] on startup when Fx 2.0 libraries not removed from install directory. r=bsmedberg, blocking1.9=dsicore

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@248159 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rob_strong%exchangecode.com
2008-03-19 00:15:10 +00:00
parent 116d0d6c1b
commit 2a3bc76ce8
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/toolkit/mozapps/installer/windows/nsis/common.nsh
View File

@@ -3541,13 +3541,27 @@
StrCmp $R1 "File:" +1 end
StrCpy $R9 "$R9" "" 6
IfFileExists "$INSTDIR$R9" +1 end
ClearErrors
Delete "$INSTDIR$R9"
IfErrors +1 +3
${LogMsg} "** ERROR Deleting File: $INSTDIR$R9 **"
${DeleteFile} "$INSTDIR$R9"
IfErrors +3 +1
${LogMsg} "Deleted File: $INSTDIR$R9"
GoTo end
${LogMsg} "Deleted File: $INSTDIR$R9"
ClearErrors
Rename "$INSTDIR$R9" "$INSTDIR$R9.moz-delete"
IfErrors +1 reboot_delete
; Original file will be deleted on reboot
Delete /REBOOTOK "$INSTDIR$R9"
${LogMsg} "Delayed Delete File (Reboot Required): $INSTDIR$R9"
GoTo end
; Renamed file will be deleted on reboot
reboot_delete:
Delete /REBOOTOK "$INSTDIR$R9.moz-delete"
${LogMsg} "Delayed Delete File (Reboot Required): $INSTDIR$R9.moz-delete"
GoTo end
end:
ClearErrors