claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed cassette ejecting and made write protection actually work, closes #1564.

Browse Source
This commit is contained in:
OBattler
2021-07-29 05:36:10 +02:00
parent f52a688713
commit 026bed4e53
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/device/cassette.c
View File

@@ -418,7 +418,7 @@ int pc_cas_read_smp (pc_cassette_t *cas)
static static
void pc_cas_write_bit (pc_cassette_t *cas, unsigned char val) void pc_cas_write_bit (pc_cassette_t *cas, unsigned char val)
{ {
if (val) { if (val && !cassette_ui_writeprot) {
cas->cas_out_buf |= (0x80 >> cas->cas_out_cnt); cas->cas_out_buf |= (0x80 >> cas->cas_out_cnt);
} }
@@ -426,7 +426,8 @@ void pc_cas_write_bit (pc_cassette_t *cas, unsigned char val)
if (cas->cas_out_cnt >= 8) { if (cas->cas_out_cnt >= 8) {
if (cas->fp != NULL) { if (cas->fp != NULL) {
fputc (cas->cas_out_buf, cas->fp); if (!cassette_ui_writeprot)
fputc (cas->cas_out_buf, cas->fp);
cas->position += 1; cas->position += 1;
} }
@@ -447,7 +448,8 @@ void pc_cas_write_smp (pc_cassette_t *cas, int val)
smp = (val > 127) ? 0x7f : val; smp = (val > 127) ? 0x7f : val;
} }
fputc (smp, cas->fp); if (!cassette_ui_writeprot)
fputc (smp, cas->fp);
cas->position += 1; cas->position += 1;
} }

1
src/win/win_cdrom.c
View File

@@ -64,6 +64,7 @@ void
cassette_eject(void) cassette_eject(void)
{ {
pc_cas_set_fname(cassette, NULL); pc_cas_set_fname(cassette, NULL);
memset(cassette_fname, 0x00, sizeof(cassette_fname));
ui_sb_update_icon_state(SB_CASSETTE, 1); ui_sb_update_icon_state(SB_CASSETTE, 1);
media_menu_update_cassette(); media_menu_update_cassette();
ui_sb_update_tip(SB_CASSETTE); ui_sb_update_tip(SB_CASSETTE);