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

This commit is contained in:
rob_strong@exchangecode.com 2008-03-18 17:15:10 -07:00
parent 3e8f68ae6c
commit 4ea82b5215

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