Warning fixes

This commit is contained in:
Connor McLaughlin 2021-07-12 22:44:02 +10:00
parent fd3c12de84
commit bb2e459f9f
2 changed files with 5 additions and 5 deletions

View file

@ -172,10 +172,10 @@ protected:
private: private:
std::string m_title; std::string m_title;
u64 m_start_time;
u64 m_last_update_time;
u64 m_min_time; u64 m_min_time;
u64 m_update_interval; u64 m_update_interval;
u64 m_start_time;
u64 m_last_update_time;
u32 m_progress; u32 m_progress;
u32 m_total; u32 m_total;
}; };

View file

@ -910,9 +910,9 @@ void HostInterface::CheckForSettingsChanges(const Settings& old_settings)
if (g_settings.multitap_mode != old_settings.multitap_mode) if (g_settings.multitap_mode != old_settings.multitap_mode)
System::UpdateMultitaps(); System::UpdateMultitaps();
if (m_display && g_settings.display_linear_filtering != old_settings.display_linear_filtering || 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_integer_scaling != old_settings.display_integer_scaling ||
g_settings.display_stretch != old_settings.display_stretch) g_settings.display_stretch != old_settings.display_stretch))
{ {
m_display->SetDisplayLinearFiltering(g_settings.display_linear_filtering); m_display->SetDisplayLinearFiltering(g_settings.display_linear_filtering);
m_display->SetDisplayIntegerScaling(g_settings.display_integer_scaling); m_display->SetDisplayIntegerScaling(g_settings.display_integer_scaling);