From 76dee5d47ee8b9959a3bea4564fa88253ee6385a Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Fri, 31 Mar 2023 21:24:12 +0600 Subject: [PATCH 1/3] qt: Fix mute icon in CD-ROM menus --- src/qt/qt_mediamenu.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qt/qt_mediamenu.cpp b/src/qt/qt_mediamenu.cpp index e898ea9d9..3ab5f9b60 100644 --- a/src/qt/qt_mediamenu.cpp +++ b/src/qt/qt_mediamenu.cpp @@ -572,7 +572,8 @@ MediaMenu::cdromUpdateMenu(int i) auto childs = menu->children(); auto *muteMenu = dynamic_cast(childs[cdromMutePos]); - muteMenu->setChecked(cdrom[i].sound_on == 0); + muteMenu->setIcon(QApplication::style()->standardIcon((cdrom[i].sound_on == 0) ? QStyle::SP_MediaVolume : QStyle::SP_MediaVolumeMuted)); + muteMenu->setText((cdrom[i].sound_on == 0) ? tr("&Unmute") : tr("&Mute")); auto *imageMenu = dynamic_cast(childs[cdromImagePos]); imageMenu->setEnabled(!name.isEmpty()); From 35e078b87af795e1a97e6dece68f26814e3189e3 Mon Sep 17 00:00:00 2001 From: richardg867 Date: Mon, 3 Apr 2023 18:10:31 -0300 Subject: [PATCH 2/3] Jenkins: Add workaround for one-time fluke with appimage-builder AppImage extraction --- .ci/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/build.sh b/.ci/build.sh index 56199d3e6..9b4494c46 100755 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -1139,6 +1139,7 @@ EOF --recipe AppImageBuilder-generated.yml --appdir "$(grep -oP '^\s+path: \K(.+)' AppImageBuilder-generated.yml)" status=$? [ $status -eq 0 ] && break + [ $status -eq 127 ] && rm -rf /tmp/appimage_extracted_* done # Remove appimage-builder binary on failure, just in case it's corrupted. From b1d634016e4c0f16b97cd340163b0432e71ebf3e Mon Sep 17 00:00:00 2001 From: richardg867 Date: Mon, 3 Apr 2023 19:00:47 -0300 Subject: [PATCH 3/3] Jenkins: Remove a redundant build step --- .ci/Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 6ab63ea30..b9a095554 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -78,8 +78,7 @@ def dynarecSlugs = [ ] def presets = [ - 'Regular', - 'Debug' + 'Regular' ] def presetSlugs = [