ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5673 from sephiroth99/qt2analytics 

DolphinQt2: fix compile error with analytics disabled
This commit is contained in:
shuffle2 2017-06-23 16:41:01 -07:00 committed by GitHub
parent 485589f42d 22e1a3c09f
commit 5111fc6e52
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinQt2/Settings/GeneralPane.cpp
View File

@ -142,7 +142,9 @@ void GeneralPane::LoadConfig()
{
auto& settings = Settings::Instance();
m_checkbox_force_ntsc->setChecked(settings.GetForceNTSCJ());
#if defined(USE_ANALYTICS) && USE_ANALYTICS
m_checkbox_enable_analytics->setChecked(settings.GetAnalyticsEnabled());
#endif
m_checkbox_dualcore->setChecked(SConfig::GetInstance().bCPUThread);
m_checkbox_cheats->setChecked(SConfig::GetInstance().bEnableCheats);
int selection = qRound(settings.GetEmulationSpeed() * 10);
@ -173,7 +175,9 @@ void GeneralPane::OnSaveConfig()
{
auto& settings = Settings::Instance();
settings.SetForceNTSCJ(m_checkbox_force_ntsc->isChecked());
#if defined(USE_ANALYTICS) && USE_ANALYTICS
settings.SetAnalyticsEnabled(m_checkbox_enable_analytics->isChecked());
#endif
SConfig::GetInstance().bCPUThread = m_checkbox_dualcore->isChecked();
SConfig::GetInstance().bEnableCheats = m_checkbox_cheats->isChecked();
SConfig::GetInstance().m_EmulationSpeed = m_combobox_speedlimit->currentIndex() * 0.1f;