diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 2a594c2c25..8dfb22617a 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -188,6 +188,7 @@ void SConfig::SaveInterfaceSettings(IniFile& ini) interface->Set("ExtendedFPSInfo", m_InterfaceExtendedFPSInfo); interface->Set("ThemeName", theme_name); interface->Set("PauseOnFocusLost", m_PauseOnFocusLost); + interface->Set("DisableTooltips", m_DisableTooltips); } void SConfig::SaveDisplaySettings(IniFile& ini) @@ -491,6 +492,7 @@ void SConfig::LoadInterfaceSettings(IniFile& ini) interface->Get("ExtendedFPSInfo", &m_InterfaceExtendedFPSInfo, false); interface->Get("ThemeName", &theme_name, DEFAULT_THEME_DIR); interface->Get("PauseOnFocusLost", &m_PauseOnFocusLost, false); + interface->Get("DisableTooltips", &m_DisableTooltips, false); } void SConfig::LoadDisplaySettings(IniFile& ini) diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index 0de73761f5..b3c8ce540a 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -292,6 +292,8 @@ struct SConfig : NonCopyable bool m_PauseOnFocusLost; + bool m_DisableTooltips; + // DSP settings bool m_DSPEnableJIT; bool m_DSPCaptureLog; diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index f87de73a0c..912bace4d9 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -110,6 +111,8 @@ bool DolphinApp::OnInit() DolphinAnalytics::Instance()->ReportDolphinStart("wx"); + wxToolTip::Enable(!SConfig::GetInstance().m_DisableTooltips); + // Enable the PNG image handler for screenshots wxImage::AddHandler(new wxPNGHandler);