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

Enable empty directories to be copied/moved. Fixes #121.

Browse Source 
This would only affect the last directory in an operation. Code appears bogus.

Also, drop note about moving locked files; macOS behaves this way too.
This commit is contained in:
Joshua Bell 2019-02-17 16:30:43 +11:00
parent b5d76efcdd
commit 11102afd80
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE-NOTES.md
View File

@ -70,6 +70,7 @@ file, then select the appropriate command from the Apple menu.
* New Folder/Rename file dialog no longer truncated after IP. (#118) * New Folder/Rename file dialog no longer truncated after IP. (#118)
* Correct rendering issues with desktop volume icons. (#117) * Correct rendering issues with desktop volume icons. (#117)
* Prevent occasional rectangle drawn on desktop after window close. (#120) * Prevent occasional rectangle drawn on desktop after window close. (#120)
* Empty directories can be copied/moved. (#121)
* Desk Accessories: * Desk Accessories:
* Date: Read-only on systems with a clock. On systems without a clock, date is saved for next session. (#30, #39) * Date: Read-only on systems with a clock. On systems without a clock, date is saved for next session. (#30, #39)
* Calculator: don't mis-paint when moved offscreen and other fixes. (#33, #34) * Calculator: don't mis-paint when moved offscreen and other fixes. (#33, #34)
@ -85,7 +86,6 @@ 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

14
desktop/desktop_main.s
View File

@ -11048,14 +11048,9 @@ is_dir: jsr decrement_op_file_count
lda #$FF lda #$FF
store: sta is_dir_flag store: sta is_dir_flag
jsr dec_file_count_and_run_copy_dialog_proc jsr dec_file_count_and_run_copy_dialog_proc
lda op_file_count+1
bne :+
lda op_file_count
bne :+
jmp close_files_cancel_dialog
;; Copy access, file_type, aux_type, storage_type ;; Copy access, file_type, aux_type, storage_type
: ldy #7 ldy #7
: lda src_file_info_params,y : lda src_file_info_params,y
sta create_params2,y sta create_params2,y
dey dey
@ -11189,13 +11184,8 @@ done: rts
: jsr append_to_dst_path : jsr append_to_dst_path
jsr dec_file_count_and_run_copy_dialog_proc jsr dec_file_count_and_run_copy_dialog_proc
jsr decrement_op_file_count jsr decrement_op_file_count
lda op_file_count+1
bne :+
lda op_file_count
bne :+
jmp close_files_cancel_dialog
: jsr try_create_dst jsr try_create_dst
bcs :+ bcs :+
jsr remove_src_path_segment jsr remove_src_path_segment
jmp done jmp done