80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of https://github.com/86Box/86Box into qt

Browse Source
This commit is contained in:
ts-korhonen
2022-02-04 17:02:40 +02:00
parent 09f6053b8b ec00dc978c
commit 129ffab728
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.ci/Jenkinsfile vendored
View File

@@ -271,7 +271,8 @@ pipeline {
result: currentBuild.currentResult, result: currentBuild.currentResult,
description: "**Status:** ${result}\n\u2060", /* word joiner character forces a blank line */ description: "**Status:** ${result}\n\u2060", /* word joiner character forces a blank line */
enableArtifactsList: false, enableArtifactsList: false,
showChangeset: true showChangeset: true,
scmWebUrl: "https://github.com/86Box/86Box/commit/%s"
/* Notify IRC, which needs a node for whatever reason. */ /* Notify IRC, which needs a node for whatever reason. */
node { node {

2
.ci/build.sh
View File

@@ -214,7 +214,7 @@ else
esac esac
# Establish general and architecture-specific dependencies. # Establish general and architecture-specific dependencies.
pkgs="cmake git tar xz-utils dpkg-dev rpm" pkgs="cmake pkg-config git tar xz-utils dpkg-dev rpm"
if [ "$(dpkg --print-architecture)" = "$arch_deb" ] if [ "$(dpkg --print-architecture)" = "$arch_deb" ]
then then
pkgs="$pkgs build-essential" pkgs="$pkgs build-essential"

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; dev->regs[0x14 >> 1] = AC97_MUTE | 0x0808;
if (dev->misc_flags & AC97_AUXIN) if (dev->misc_flags & AC97_AUXIN)
dev->regs[0x14 >> 1] = AC97_MUTE | 0x0808; 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) 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) if (dev->misc_flags & AC97_LDAC)
dev->regs[0x36 >> 1] = AC97_MUTE_L; dev->regs[0x36 >> 1] = AC97_MUTE_L;
if (dev->misc_flags & AC97_CDAC) 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; OPENFILENAME ofn;
BOOL r; BOOL r;
/* DWORD err; */ /* DWORD err; */
int old_dopause;
/* Initialize OPENFILENAME */ /* Initialize OPENFILENAME */
ZeroMemory(&ofn, sizeof(ofn)); ZeroMemory(&ofn, sizeof(ofn));
@@ -187,10 +188,13 @@ file_dlg_w(HWND hwnd, WCHAR *f, WCHAR *fn, WCHAR *title, int save)
ofn.lpstrTitle = title; ofn.lpstrTitle = title;
/* Display the Open dialog box. */ /* Display the Open dialog box. */
old_dopause = dopause;
plat_pause(1);
if (save) if (save)
r = GetSaveFileName(&ofn); r = GetSaveFileName(&ofn);
else else
r = GetOpenFileName(&ofn); r = GetOpenFileName(&ofn);
plat_pause(old_dopause);
plat_chdir(usr_path); plat_chdir(usr_path);