From bb2e459f9f8915648cb690162911b12bc835498c Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Mon, 12 Jul 2021 22:44:02 +1000 Subject: [PATCH] Warning fixes --- src/core/gpu_hw.h | 4 ++-- src/core/host_interface.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/gpu_hw.h b/src/core/gpu_hw.h index 6580189f9..56bcd7c4d 100644 --- a/src/core/gpu_hw.h +++ b/src/core/gpu_hw.h @@ -172,10 +172,10 @@ protected: private: std::string m_title; - u64 m_start_time; - u64 m_last_update_time; u64 m_min_time; u64 m_update_interval; + u64 m_start_time; + u64 m_last_update_time; u32 m_progress; u32 m_total; }; diff --git a/src/core/host_interface.cpp b/src/core/host_interface.cpp index 75284693a..c220bb70c 100644 --- a/src/core/host_interface.cpp +++ b/src/core/host_interface.cpp @@ -910,9 +910,9 @@ void HostInterface::CheckForSettingsChanges(const Settings& old_settings) if (g_settings.multitap_mode != old_settings.multitap_mode) System::UpdateMultitaps(); - if (m_display && g_settings.display_linear_filtering != old_settings.display_linear_filtering || - g_settings.display_integer_scaling != old_settings.display_integer_scaling || - g_settings.display_stretch != old_settings.display_stretch) + if (m_display && (g_settings.display_linear_filtering != old_settings.display_linear_filtering || + g_settings.display_integer_scaling != old_settings.display_integer_scaling || + g_settings.display_stretch != old_settings.display_stretch)) { m_display->SetDisplayLinearFiltering(g_settings.display_linear_filtering); m_display->SetDisplayIntegerScaling(g_settings.display_integer_scaling);