diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp')
| -rw-r--r-- | emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp b/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp index 80b3eeb0c45a..29dc9baa8070 100644 --- a/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp +++ b/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp @@ -1,6 +1,6 @@ ---- src/gui/sdl_gui.cpp.orig 2024-10-02 06:16:36 UTC +--- src/gui/sdl_gui.cpp.orig 2025-10-07 15:49:14 UTC +++ src/gui/sdl_gui.cpp -@@ -3888,6 +3888,7 @@ void GUI_Shortcut(int select) { +@@ -3886,6 +3886,7 @@ void GUI_Shortcut(int select) { shortcutid=select; shortcut=true; sel = select; @@ -8,7 +8,7 @@ #if defined(USE_TTF) if (ttf.inUse && !confres) { ttf_switch_off(); -@@ -3897,12 +3898,14 @@ void GUI_Shortcut(int select) { +@@ -3895,12 +3896,14 @@ void GUI_Shortcut(int select) { } else #endif RunCfgTool(0); @@ -23,7 +23,7 @@ #if defined(USE_TTF) if (ttf.inUse) { ttf_switch_off(); -@@ -3912,4 +3915,5 @@ void GUI_Run(bool pressed) { +@@ -3910,4 +3913,5 @@ void GUI_Run(bool pressed) { } else #endif RunCfgTool(0); |