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

Some fixes with CD-ROM status bar menu

Browse Source 
Checking and unchecking 'Mute' now works.
This commit is contained in:
basic2004
2017-08-18 14:47:54 +09:00
committed by GitHub
parent 4485d8b970
commit 2540f62678
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/WIN/win.c
View File

@@ -2027,8 +2027,8 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
break; break;
case IDM_VID_CGACON: case IDM_VID_CGACON:
vid_cga_contrast = !vid_cga_contrast; vid_cga_contrast ^= 1;
CheckMenuItem(menu, IDM_VID_CGACON, vid_cga_contrast ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hmenu, IDM_VID_CGACON, vid_cga_contrast ? MF_CHECKED : MF_UNCHECKED);
cgapal_rebuild(); cgapal_rebuild();
saveconfig(); saveconfig();
break; break;
@@ -2403,8 +2403,6 @@ LRESULT CALLBACK StatusBarProcedure(HWND hwnd, UINT message, WPARAM wParam, LPAR
int part = 0; int part = 0;
int letter = 0; int letter = 0;
HMENU hmenu;
switch (message) switch (message)
{ {
case WM_COMMAND: case WM_COMMAND:
@@ -2452,10 +2450,14 @@ LRESULT CALLBACK StatusBarProcedure(HWND hwnd, UINT message, WPARAM wParam, LPAR
case IDM_CDROM_MUTE: case IDM_CDROM_MUTE:
id = item_params & 0x0007; id = item_params & 0x0007;
hmenu = GetSubMenu(smenu, id + 4); part = find_status_bar_part(SB_CDROM | id);
Sleep(100); if ((part == -1) || (sb_menu_handles == NULL))
cdrom_drives[id].sound_on ^= 1; {
CheckMenuItem(hmenu, IDM_CDROM_MUTE | id, cdrom_drives[id].sound_on ? MF_UNCHECKED : MF_CHECKED); break;
}
cdrom_drives[id].sound_on ^= 1;
CheckMenuItem(sb_menu_handles[part], IDM_CDROM_MUTE | id, cdrom_drives[id].sound_on ? MF_UNCHECKED : MF_CHECKED);
saveconfig(); saveconfig();
sound_cd_thread_reset(); sound_cd_thread_reset();
break; break;