Merge pull request #4390 from nanshiki/keylayoutjp

Fixed keyboardlayout=jp to be Japanese keyboard layout.
joncampbell123 · Jul 30, 2023 · 2615e65 · 2615e65
2 parents 1be510b + cf8bd0f
commit 2615e65
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/dos/dos_keyboard_layout.cpp b/src/dos/dos_keyboard_layout.cpp
@@ -1712,7 +1712,7 @@ class DOS_KeyboardLayout: public Module_base {
 			}
 		}
         if (tocp && !IS_PC98_ARCH) {
-            if(dos.loaded_codepage == 932 && !strcmp(layoutname, "jp106")) loaded_layout->read_keyboard_file(layoutname, dos.loaded_codepage);
+            if((dos.loaded_codepage == 932 || tocp == 932) && (!strcmp(layoutname, "jp106") || !strcmp(layoutname, "jp"))) loaded_layout->read_keyboard_file(layoutname, 932);
 
             uint16_t cpbak = dos.loaded_codepage;
 #if defined(USE_TTF)