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

Qt: Fix overrides getting discarded (fixes #1354)

This commit is contained in:
Vicki Pfau 2019-03-14 18:33:08 -07:00
parent 85a3c6f00e
commit bfe6c02159
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -21,6 +21,7 @@ Other fixes:
- Qt: More app metadata fixes - Qt: More app metadata fixes
- Qt: Fix load recent from archive (fixes mgba.io/i/1325) - Qt: Fix load recent from archive (fixes mgba.io/i/1325)
- LR35902: Fix disassembly of several CB-prefix instructions - LR35902: Fix disassembly of several CB-prefix instructions
- Qt: Fix overrides getting discarded (fixes mgba.io/i/1354)
Misc: Misc:
- GBA Savedata: EEPROM performance fixes - GBA Savedata: EEPROM performance fixes
- GBA Savedata: Automatically map 1Mbit Flash files as 1Mbit Flash - GBA Savedata: Automatically map 1Mbit Flash files as 1Mbit Flash

29
src/platform/qt/CoreController.cpp
View File

@ -866,8 +866,33 @@ void CoreController::updateFastForward() {
m_threadContext.impl->sync.fpsTarget = m_fpsTarget; m_threadContext.impl->sync.fpsTarget = m_fpsTarget;
setSync(true); setSync(true);
} }
// XXX: Have a way of just updating opts // XXX: Have a way of just updating volume
m_threadContext.core->loadConfig(m_threadContext.core, &m_threadContext.core->config); switch (platform()) {
#ifdef M_CORE_GBA
case PLATFORM_GBA: {
GBA* gba = static_cast<GBA*>(m_threadContext.core->board);
if (m_threadContext.core->opts.mute) {
gba->audio.masterVolume = 0;
} else {
gba->audio.masterVolume = m_threadContext.core->opts.volume;
}
break;
}
#endif
#ifdef M_CORE_GB
case PLATFORM_GB: {
GB* gb = static_cast<GB*>(m_threadContext.core->board);
if (m_threadContext.core->opts.mute) {
gb->audio.masterVolume = 0;
} else {
gb->audio.masterVolume = m_threadContext.core->opts.volume;
}
break;
}
#endif
default:
break;
}
} }
CoreController::Interrupter::Interrupter(CoreController* parent, bool fromThread) CoreController::Interrupter::Interrupter(CoreController* parent, bool fromThread)