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

Merge branch '86Box:master' into fix-ukr-lang

Browse Source
This commit is contained in:
SuperMaxusa
2022-02-04 22:09:13 +02:00
committed by GitHub
parent a9affb6c8b ec00dc978c
commit f88777ac09
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sound/snd_ac97_codec.c
View File

@@ -467,9 +467,9 @@ ac97_codec_reset(void *priv)
dev->regs[0x14 >> 1] = AC97_MUTE | 0x0808;
if (dev->misc_flags & AC97_AUXIN)
dev->regs[0x14 >> 1] = AC97_MUTE | 0x0808;
dev->regs[0x1c] = AC97_MUTE; /* record gain */
dev->regs[0x1c >> 1] = AC97_MUTE; /* record gain */
if (dev->reset_flags & AC97_MICPCM)
dev->regs[0x1e] = AC97_MUTE; /* mic record gain */
dev->regs[0x1e >> 1] = AC97_MUTE; /* mic record gain */
if (dev->misc_flags & AC97_LDAC)
dev->regs[0x36 >> 1] = AC97_MUTE_L;
if (dev->misc_flags & AC97_CDAC)

4
src/win/win_dialog.c
View File

@@ -161,6 +161,7 @@ file_dlg_w(HWND hwnd, WCHAR *f, WCHAR *fn, WCHAR *title, int save)
OPENFILENAME ofn;
BOOL r;
/* DWORD err; */
int old_dopause;
/* Initialize OPENFILENAME */
ZeroMemory(&ofn, sizeof(ofn));
@@ -187,10 +188,13 @@ file_dlg_w(HWND hwnd, WCHAR *f, WCHAR *fn, WCHAR *title, int save)
ofn.lpstrTitle = title;
/* Display the Open dialog box. */
old_dopause = dopause;
plat_pause(1);
if (save)
r = GetSaveFileName(&ofn);
else
r = GetOpenFileName(&ofn);
plat_pause(old_dopause);
plat_chdir(usr_path);