Merge pull request #1102 from Chilledheart/win32_fix_escape_button_in…

…_about_dialog win32: handle escape in about dialog
Chilledheart · Sep 26, 2024 · d42abc2 · d42abc2
2 parents 6fff96f + fef4b88
commit d42abc2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/releases-deb.yml b/.github/workflows/releases-deb.yml
@@ -279,9 +279,9 @@ jobs:
         if: ${{ steps.schroot-cache.outputs.cache-hit != 'true' && matrix.arch == 'riscv64' && matrix.distro == 'trixie' }}
         run: |
           # https://launchpad.net/ubuntu/oracular/amd64/libc6-dev-riscv64-cross
-          curl -O http://launchpadlibrarian.net/742667245/libc6-dev-riscv64-cross_2.40-1ubuntu1cross2_all.deb
+          curl -O http://launchpadlibrarian.net/749345307/libc6-dev-riscv64-cross_2.40-1ubuntu3cross1_all.deb
           # https://launchpad.net/ubuntu/oracular/amd64/libc6-riscv64-cross
-          curl -O http://launchpadlibrarian.net/742667260/libc6-riscv64-cross_2.40-1ubuntu1cross2_all.deb
+          curl -O http://launchpadlibrarian.net/749345318/libc6-riscv64-cross_2.40-1ubuntu3cross1_all.deb
           sudo schroot --chroot "source:${{ matrix.distro }}-${{ env.BUILD_ARCH }}-${{ matrix.arch }}" --user root -- \
             dpkg --force-depends -i $PWD/*.deb || true
           sudo schroot --chroot "source:${{ matrix.distro }}-${{ env.BUILD_ARCH }}-${{ matrix.arch }}" --user root -- \

diff --git a/src/win32/yass_frame.cpp b/src/win32/yass_frame.cpp
@@ -1153,7 +1153,7 @@ INT_PTR CALLBACK CYassFrame::OnAppAboutMessage(HWND hDlg, UINT message, WPARAM w
       return static_cast<INT_PTR>(TRUE);
     }
     case WM_COMMAND:
-      if (LOWORD(wParam) == IDOK) {
+      if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) {
         EndDialog(hDlg, LOWORD(wParam));
         return static_cast<INT_PTR>(TRUE);
       }