equal
deleted
inserted
replaced
311 bool has_error = false; // true when an invalid char is detected |
311 bool has_error = false; // true when an invalid char is detected |
312 |
312 |
313 if (StrEmpty(_keyboard_opt[0])) { |
313 if (StrEmpty(_keyboard_opt[0])) { |
314 GetString(keyboard[0], STR_OSK_KEYBOARD_LAYOUT, lastof(keyboard[0])); |
314 GetString(keyboard[0], STR_OSK_KEYBOARD_LAYOUT, lastof(keyboard[0])); |
315 } else { |
315 } else { |
316 strncpy(keyboard[0], _keyboard_opt[0], lengthof(keyboard[0])); |
316 strecpy(keyboard[0], _keyboard_opt[0], lastof(keyboard[0])); |
317 } |
317 } |
318 |
318 |
319 if (StrEmpty(_keyboard_opt[1])) { |
319 if (StrEmpty(_keyboard_opt[1])) { |
320 GetString(keyboard[1], STR_OSK_KEYBOARD_LAYOUT_CAPS, lastof(keyboard[1])); |
320 GetString(keyboard[1], STR_OSK_KEYBOARD_LAYOUT_CAPS, lastof(keyboard[1])); |
321 } else { |
321 } else { |
322 strncpy(keyboard[1], _keyboard_opt[1], lengthof(keyboard[1])); |
322 strecpy(keyboard[1], _keyboard_opt[1], lastof(keyboard[1])); |
323 } |
323 } |
324 |
324 |
325 for (uint j = 0; j < 2; j++) { |
325 for (uint j = 0; j < 2; j++) { |
326 const char *kbd = keyboard[j]; |
326 const char *kbd = keyboard[j]; |
327 bool ended = false; |
327 bool ended = false; |