Merge branch 'master' of https://github.com/86Box/86Box into qt
This commit is contained in:
3
.ci/Jenkinsfile
vendored
3
.ci/Jenkinsfile
vendored
@@ -271,7 +271,8 @@ pipeline {
|
||||
result: currentBuild.currentResult,
|
||||
description: "**Status:** ${result}\n\u2060", /* word joiner character forces a blank line */
|
||||
enableArtifactsList: false,
|
||||
showChangeset: true
|
||||
showChangeset: true,
|
||||
scmWebUrl: "https://github.com/86Box/86Box/commit/%s"
|
||||
|
||||
/* Notify IRC, which needs a node for whatever reason. */
|
||||
node {
|
||||
|
@@ -214,7 +214,7 @@ else
|
||||
esac
|
||||
|
||||
# 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" ]
|
||||
then
|
||||
pkgs="$pkgs build-essential"
|
||||
|
@@ -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)
|
||||
|
@@ -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);
|
||||
|
||||
|
Reference in New Issue
Block a user