diff --git a/src/hle/rt64_application.cpp b/src/hle/rt64_application.cpp index c8a0d33..dbd1c39 100644 --- a/src/hle/rt64_application.cpp +++ b/src/hle/rt64_application.cpp @@ -494,6 +494,9 @@ namespace RT64 { case SDL_SCANCODE_F4: processDeveloperShortcut(DeveloperShortcut::Replacements); return true; + default: + // Don't filter the key event. + break; } } diff --git a/src/hle/rt64_application_window.cpp b/src/hle/rt64_application_window.cpp index 8aeffde..c1c99e4 100644 --- a/src/hle/rt64_application_window.cpp +++ b/src/hle/rt64_application_window.cpp @@ -23,16 +23,7 @@ namespace RT64 { ApplicationWindow *ApplicationWindow::HookedApplicationWindow = nullptr; ApplicationWindow::ApplicationWindow() { - windowHandle = {}; - sdlEventFilterUserdata = nullptr; - sdlEventFilterStored = false; - fullScreen = false; - lastMaximizedState = false; -# ifdef _WIN32 - windowHook = nullptr; - windowMenu = nullptr; -# endif - usingSdl = false; + // Empty. } ApplicationWindow::~ApplicationWindow() { diff --git a/src/hle/rt64_application_window.h b/src/hle/rt64_application_window.h index bf6fefb..393d82a 100644 --- a/src/hle/rt64_application_window.h +++ b/src/hle/rt64_application_window.h @@ -31,12 +31,12 @@ namespace RT64 { # endif }; - RenderWindow windowHandle; + RenderWindow windowHandle = {}; Listener *listener; uint32_t refreshRate = 0; - bool fullScreen; - bool lastMaximizedState; - bool usingSdl; + bool fullScreen = false; + bool lastMaximizedState = false; + bool usingSdl = false; int32_t windowLeft = INT32_MAX; int32_t windowTop = INT32_MAX; SDL_EventFilter sdlEventFilterStored = nullptr; @@ -44,9 +44,9 @@ namespace RT64 { bool sdlEventFilterInstalled = false; # ifdef _WIN32 - HHOOK windowHook; - HMENU windowMenu; - RECT lastWindowRect; + HHOOK windowHook = nullptr; + HMENU windowMenu = nullptr; + RECT lastWindowRect = {}; # endif ApplicationWindow();