[Scummvm-git-logs] scummvm master -> 7ff1533799127ddbce0377f1c92780e943841576

[criezy]

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:
7ff1533799 GUI: Fix setting the soundfont in ConfMan


Commit: 7ff1533799127ddbce0377f1c92780e943841576
    https://github.com/scummvm/scummvm/commit/7ff1533799127ddbce0377f1c92780e943841576
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2022-06-02T20:07:49+01:00

Commit Message:
GUI: Fix setting the soundfont in ConfMan

This fixes bug #13531.
The issue was a regression introduced in commit 7dd0c1ddf8.

Changed paths:
    gui/options.cpp


diff --git a/gui/options.cpp b/gui/options.cpp
index efda91c2681..0a0560f1d97 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -908,8 +908,8 @@ void OptionsDialog::apply() {
 			Common::U32String soundFont(_soundFont->getLabel());
 			if (soundFont != ConfMan.get("soundfont", _domain)) {
 				_soundFont->setFontColor(ThemeEngine::FontColor::kFontColorNormal); 
-				if (soundFont.empty() || (soundFont != _c("None", "soundfont")))
-					ConfMan.removeKey("soundpath", _domain); 
+				if (soundFont.empty() || (soundFont == _c("None", "soundfont")))
+					ConfMan.removeKey("soundfont", _domain);
 				else 
 					ConfMan.set("soundfont", soundFont.encode(), _domain); 
 			}