cpp/openttd-patchpack/source Changeset - r8739:43248b3c4490

Changeset - r8739:43248b3c4490

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 16 years ago 2008-03-26 11:50:53
rubidium@openttd.org

(svn r12428) -Fix [FS#1878]: loading from the config file could fail even when the data is correct. Patch by Dominik.

1 file changed with 9 insertions and 1 deletions:

src/osk_gui.cpp

0 comments (0 inline, 0 general)

src/osk_gui.cpp

➞

Show inline comments

@@ @@ -299,14 +299,22 @@ void GetKeyboardLayout() @@
 	if (StrEmpty(_keyboard_opt[1])) {
 		GetString(keyboard[1], STR_OSK_KEYBOARD_LAYOUT_CAPS, lastof(keyboard[1]));
 	} else {
-		strncpy(keyboard[0], _keyboard_opt[0], lengthof(keyboard[1]));
+		strncpy(keyboard[1], _keyboard_opt[1], lengthof(keyboard[1]));
+	}
 	for (uint j = 0; j < 2; j++) {
 		const char *kbd = keyboard[j];
 		bool ended = false;
 		for (uint i = 0; i < OSK_KEYBOARD_ENTRIES; i++) {
 			_keyboard[j][i] = Utf8Consume(&kbd);
 			/* Be lenient when the last characters are missing (is quite normal) */
 			if (_keyboard[j][i] == '\0' || ended) {
 				ended = true;
 				_keyboard[j][i] = ' ';
 				continue;
+			}
 			if (IsPrintable(_keyboard[j][i])) {
 				errormark[j][i] = ' ';
 			} else {

0 comments (0 inline, 0 general)