[Scummvm-git-logs] scummvm master -> e5caf79c6a39b06b37ea7486cd9989418c9b49ce

sev- sev at scummvm.org
Mon Oct 14 21:13:03 CEST 2019


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

Summary:
be95a7a2dd JANITORIAL: Whitespace fixes
e5caf79c6a GUI: Fix crash with attempt to switch to Greek or Hebrew


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

Commit Message:
JANITORIAL: Whitespace fixes

Changed paths:
    gui/options.cpp


diff --git a/gui/options.cpp b/gui/options.cpp
index 772f946..22202b5 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -1996,7 +1996,7 @@ void GlobalOptionsDialog::addNetworkControls(GuiObject *boss, const Common::Stri
 		_featureDescriptionLine1 = new StaticTextWidget(boss, prefix + "FeatureDescriptionLine1", _("Run server to manage files with browser (in the same network)."), "", ThemeEngine::kFontStyleNormal);
 		_featureDescriptionLine2 = new StaticTextWidget(boss, prefix + "FeatureDescriptionLine2", _("Closing options dialog will stop the server."), "", ThemeEngine::kFontStyleNormal);
 	}
-	
+
 	reflowNetworkTabLayout();
 
 }
@@ -2736,7 +2736,7 @@ void GlobalOptionsDialog::reflowNetworkTabLayout() {
 			_serverInfoLabel->setLabel(_("Not running"));
 	}
 	if (_rootPathButton) _rootPathButton->setVisible(true);
-	if (_rootPath) _rootPath->setVisible(true);	
+	if (_rootPath) _rootPath->setVisible(true);
 	if (_rootPathClearButton) _rootPathClearButton->setVisible(true);
 #ifdef NETWORKING_LOCALWEBSERVER_ENABLE_PORT_OVERRIDE
 	if (_serverPortDesc) {


Commit: e5caf79c6a39b06b37ea7486cd9989418c9b49ce
    https://github.com/scummvm/scummvm/commit/e5caf79c6a39b06b37ea7486cd9989418c9b49ce
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-14T21:11:52+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 22202b5..073d04b 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);





More information about the Scummvm-git-logs mailing list