fix SwapProDOS confusion in WriteRAMToDisk (always return and let caller handle rechecking for key

This commit is contained in:
4am 2021-04-29 15:53:27 -04:00
parent fa16586550
commit ef666f7b43
2 changed files with 4 additions and 4 deletions

View File

@ -157,6 +157,8 @@ Pass
jsr SwapProDOS ; ProDOS out -> in jsr SwapProDOS ; ProDOS out -> in
jsr WriteRAMToDisk jsr WriteRAMToDisk
jsr SwapProDOS ; ProDOS in -> out (preserves flags) jsr SwapProDOS ; ProDOS in -> out (preserves flags)
lda KEY
bmi Cancel
bcc @printFinalMessage bcc @printFinalMessage
jmp FatalWriteError jmp FatalWriteError

View File

@ -66,7 +66,7 @@ DeleteFileOnRAMDisk
; in: ProDOS is in memory ; in: ProDOS is in memory
; out: if error, C set and A contains error code ; out: if error, C set and A contains error code
; if success, C clear ; if success, C clear
; if a key is pressed, exits via Cancel ; if a key is pressed, C clear and A contains keycode
; all other flags clobbered ; all other flags clobbered
; all registers clobbered ; all registers clobbered
; ProDOS is in memory ; ProDOS is in memory
@ -95,7 +95,7 @@ WriteRAMToDisk
jsr WriteTrackSecondPass jsr WriteTrackSecondPass
bcs @exit bcs @exit
lda KEY lda KEY
bmi @cancel bmi @exit
inc gTrack inc gTrack
lda gTrack lda gTrack
cmp #$23 cmp #$23
@ -104,5 +104,3 @@ WriteRAMToDisk
jsr IncProgress jsr IncProgress
clc clc
@exit rts @exit rts
@cancel
jmp Cancel