diff --git a/src/duckstation-nogui/nogui_host_interface.cpp b/src/duckstation-nogui/nogui_host_interface.cpp index ffa35ec85..2438f95de 100644 --- a/src/duckstation-nogui/nogui_host_interface.cpp +++ b/src/duckstation-nogui/nogui_host_interface.cpp @@ -194,22 +194,12 @@ void NoGUIHostInterface::RequestExit() m_quit_request = true; } -void NoGUIHostInterface::PollAndUpdate() -{ - CommonHostInterface::PollAndUpdate(); - - if (m_controller_interface) - m_controller_interface->PollEvents(); -} - void NoGUIHostInterface::Run() { while (!m_quit_request) { RunCallbacks(); PollAndUpdate(); - if (m_fullscreen_ui_enabled) - FullscreenUI::SetImGuiNavInputs(); ImGui::NewFrame(); diff --git a/src/duckstation-nogui/nogui_host_interface.h b/src/duckstation-nogui/nogui_host_interface.h index b70e3496b..42964e843 100644 --- a/src/duckstation-nogui/nogui_host_interface.h +++ b/src/duckstation-nogui/nogui_host_interface.h @@ -42,7 +42,6 @@ protected: void ReleaseHostDisplay() override; void RequestExit() override; - virtual void PollAndUpdate() override; virtual bool CreatePlatformWindow(bool fullscreen) = 0; virtual void DestroyPlatformWindow() = 0; diff --git a/src/duckstation-qt/qthostinterface.cpp b/src/duckstation-qt/qthostinterface.cpp index c4979b480..9e69505fb 100644 --- a/src/duckstation-qt/qthostinterface.cpp +++ b/src/duckstation-qt/qthostinterface.cpp @@ -651,14 +651,6 @@ void* QtHostInterface::GetTopLevelWindowHandle() const return reinterpret_cast(m_main_window->winId()); } -void QtHostInterface::PollAndUpdate() -{ - CommonHostInterface::PollAndUpdate(); - - if (m_controller_interface) - m_controller_interface->PollEvents(); -} - void QtHostInterface::RequestExit() { emit exitRequested(); diff --git a/src/duckstation-qt/qthostinterface.h b/src/duckstation-qt/qthostinterface.h index 878279e4b..ca99ad5bd 100644 --- a/src/duckstation-qt/qthostinterface.h +++ b/src/duckstation-qt/qthostinterface.h @@ -192,7 +192,6 @@ protected: void ReleaseHostDisplay() override; bool IsFullscreen() const override; bool SetFullscreen(bool enabled) override; - void PollAndUpdate() override; void RequestExit() override; std::optional GetHostKeyCode(const std::string_view key_code) const override; diff --git a/src/frontend-common/common_host_interface.cpp b/src/frontend-common/common_host_interface.cpp index 624f49995..26958e22d 100644 --- a/src/frontend-common/common_host_interface.cpp +++ b/src/frontend-common/common_host_interface.cpp @@ -470,6 +470,12 @@ void CommonHostInterface::OnAchievementsRefreshed() void CommonHostInterface::PollAndUpdate() { + if (m_controller_interface) + m_controller_interface->PollEvents(); + + if (m_fullscreen_ui_enabled) + FullscreenUI::SetImGuiNavInputs(); + #ifdef WITH_DISCORD_PRESENCE PollDiscordPresence(); #endif