diff options
| author | Colin Snover | 2017-06-09 20:40:08 -0500 |
|---|---|---|
| committer | Colin Snover | 2017-06-09 23:30:10 -0500 |
| commit | 57d257b36a1a4c9657dff360cca4d1d58bb880e0 (patch) | |
| tree | 5c5b95b375df7eeea2e710ee1703a04ac0fcb2e7 /engines/sci/sci.h | |
| parent | 85e35943fe27b99a91d97eace3072117c2073f69 (diff) | |
| download | scummvm-rg350-57d257b36a1a4c9657dff360cca4d1d58bb880e0.tar.gz scummvm-rg350-57d257b36a1a4c9657dff360cca4d1d58bb880e0.tar.bz2 scummvm-rg350-57d257b36a1a4c9657dff360cca4d1d58bb880e0.zip | |
SCI32: Fix audio sync recursion
Calling to SciEngine::syncSoundSettings from GuestAdditions
recurses back into GuestAdditions, which is obviously not
desirable. Even when it didn't manage to cause infinite recursion
(as in SQ6 demo), it would make the UI behave in broken ways (e.g.
the +/- buttons on the music slider in SQ6 would not work because
the UI would just get updated immediately back to the closest
rounded value).
Diffstat (limited to 'engines/sci/sci.h')
| -rw-r--r-- | engines/sci/sci.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/sci/sci.h b/engines/sci/sci.h index ef2fb3ba75..3139f1583b 100644 --- a/engines/sci/sci.h +++ b/engines/sci/sci.h @@ -260,7 +260,8 @@ public: Common::Error saveGameState(int slot, const Common::String &desc); bool canLoadGameStateCurrently(); bool canSaveGameStateCurrently(); - void syncSoundSettings(); + void syncSoundSettings(); ///< from ScummVM to the game + void updateSoundMixerVolumes(); uint32 getTickCount(); void setTickCount(const uint32 ticks); |