[Scummvm-git-logs] scummvm master -> 61c4cbe1f42ec74da1452ebb3ea8d6bfec74ab84

[athrxx]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
61c4cbe1f4 GUI: fix broken GMM sound settings (regression from 44245eeb)


Commit: 61c4cbe1f42ec74da1452ebb3ea8d6bfec74ab84
    https://github.com/scummvm/scummvm/commit/61c4cbe1f42ec74da1452ebb3ea8d6bfec74ab84
Author: athrxx (athrxx at scummvm.org)
Date: 2021-11-11T22:06:41+01:00

Commit Message:
GUI: fix broken GMM sound settings (regression from 44245eeb)

I would get an assert(!domName.empty())  whenever I use the ingame GMM sound settings, since that commit tries to remove keys even from the default/empty domain

Changed paths:
    gui/options.cpp


diff --git a/gui/options.cpp b/gui/options.cpp
index c131b3c1e7..05ecd33d96 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -928,7 +928,7 @@ void OptionsDialog::apply() {
 
 				ConfMan.setBool("subtitles", subtitles, _domain);
 				ConfMan.setBool("speech_mute", speech_mute, _domain);
-			} else {
+			} else if (!_domain.empty()) {
 				ConfMan.removeKey("subtitles", _domain);
 				ConfMan.removeKey("speech_mute", _domain);
 			}