[Scummvm-git-logs] scummvm branch-2-1 -> b030f7fdb47806230e28c37ff9d05e3291a44fc1

[sev-]

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:
b030f7fdb4 GUI: Fix crash with attempt to switch to Greek or Hebrew


Commit: b030f7fdb47806230e28c37ff9d05e3291a44fc1
    https://github.com/scummvm/scummvm/commit/b030f7fdb47806230e28c37ff9d05e3291a44fc1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-14T21:13:20+02:00

Commit Message:
GUI: Fix crash with attempt to switch to Greek or Hebrew

These languages have 2 charater codes, and setting third character
in the Common::String led to assert. The proper consturctor is used
instead now.

Changed paths:
    gui/options.cpp


diff --git a/gui/options.cpp b/gui/options.cpp
index 8548cc9..8e44551 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -2158,8 +2158,7 @@ void GlobalOptionsDialog::apply() {
 		if (newLang == "C")
 			ttsMan->setLanguage("en");
 		else {
-			Common::String guiLang = newLang;
-			guiLang.setChar('\0', 2);
+			Common::String guiLang(newLang.c_str(), 2);
 			ttsMan->setLanguage(guiLang);
 		}
 		_ttsVoiceSelectionPopUp->setSelectedTag(0);