From 90a36af7f77b9042a46896f6b20266f994af08f7 Mon Sep 17 00:00:00 2001 From: Dmugetsu Date: Fri, 14 Feb 2025 19:07:06 -0600 Subject: [PATCH] Fixes to Sdl --- REUSE.toml | 1 + src/emulator.cpp | 13 +++++++------ src/sdl_window.cpp | 6 +++++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/REUSE.toml b/REUSE.toml index 3bc09e328..173110d3f 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -36,6 +36,7 @@ path = [ "src/images/github.png", "src/images/grid_icon.png", "src/images/keyboard_icon.png", + "src/images/restart_icon.png", "src/images/iconsize_icon.png", "src/images/ko-fi.png", "src/images/list_icon.png", diff --git a/src/emulator.cpp b/src/emulator.cpp index 5fb8a2196..85782aa66 100644 --- a/src/emulator.cpp +++ b/src/emulator.cpp @@ -2,13 +2,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #include "common/config.h" #include "common/debug.h" @@ -16,6 +15,8 @@ #include "common/logging/log.h" #ifdef ENABLE_QT_GUI #include +#include +#include #include "common/memory_patcher.h" #endif #include "common/assert.h" diff --git a/src/sdl_window.cpp b/src/sdl_window.cpp index fb170440e..dc86fb296 100644 --- a/src/sdl_window.cpp +++ b/src/sdl_window.cpp @@ -1,7 +1,11 @@ // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#ifdef ENABLE_QT_GUI +#include #include +#include "common/memory_patcher.h" +#endif #include #include #include @@ -372,7 +376,7 @@ void WindowSDL::WaitEvent() { case SDL_EVENT_QUIT: is_open = false; break; - case SDL_EVENT_QUIT + 1: + case SDL_EVENT_QUIT + 1: is_open = false; RelaunchEmulator(); break;