Apple-2-SW/a2d
1
0
Fork 0
mirror of https://github.com/mi57730/a2d.git synced 2025-02-18 02:30:50 +00:00
Code Issues Projects Releases Wiki Activity

File moves: unlock source files as needed to delete

Browse Source
This commit is contained in:
Joshua Bell 2019-02-09 21:33:05 -08:00
parent 9d623520c8
commit 5d35f104b3
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE-NOTES.md
View File

@ -85,7 +85,7 @@ file, then select the appropriate command from the Apple menu.
* Selector app is unmodified. * Selector app is unmodified.
* Special > Disk Copy app is unmodified, and may suffer bugs fixed in DeskTop (e.g. SmartPort behavior) * Special > Disk Copy app is unmodified, and may suffer bugs fixed in DeskTop (e.g. SmartPort behavior)
* Locked files are moved without prompting.
# 1.1 # 1.1

28
desktop/desktop_main.s
View File

@ -11158,9 +11158,12 @@ copy_pop_directory:
@retry: MLI_RELAY_CALL DESTROY, destroy_params @retry: MLI_RELAY_CALL DESTROY, destroy_params
beq done beq done
cmp #ERR_ACCESS_ERROR cmp #ERR_ACCESS_ERROR
;; TODO: if ERR_ACCESS_ERROR, unlock (or prompt) bne :+
beq done jsr unlock_src_file
jsr show_error_alert beq @retry
bne done ; silently leave file
: jsr show_error_alert
jmp @retry jmp @retry
done: rts done: rts
.endproc .endproc
@ -11664,7 +11667,18 @@ retry: MLI_RELAY_CALL DESTROY, destroy_params
bne do_it ; always bne do_it ; always
: jmp close_files_cancel_dialog : jmp close_files_cancel_dialog
do_it: MLI_RELAY_CALL GET_FILE_INFO, src_file_info_params do_it: jsr unlock_src_file
bne done
jmp retry
done: rts
error: jsr show_error_alert
jmp retry
.endproc
.proc unlock_src_file
MLI_RELAY_CALL GET_FILE_INFO, src_file_info_params
lda src_file_info_params::access lda src_file_info_params::access
and #$80 and #$80
bne done bne done
@ -11673,12 +11687,8 @@ do_it: MLI_RELAY_CALL GET_FILE_INFO, src_file_info_params
copy #7, src_file_info_params ; param count for SET_FILE_INFO copy #7, src_file_info_params ; param count for SET_FILE_INFO
MLI_RELAY_CALL SET_FILE_INFO, src_file_info_params MLI_RELAY_CALL SET_FILE_INFO, src_file_info_params
copy #$A, src_file_info_params ; param count for GET_FILE_INFO copy #$A, src_file_info_params ; param count for GET_FILE_INFO
jmp retry lda #0 ; success
done: rts done: rts
error: jsr show_error_alert
jmp retry
.endproc .endproc
;;; ============================================================ ;;; ============================================================