Fix codepage switching of KEYB command

joncampbell123 · Sep 18, 2024 · b259046 · b259046
1 parent 09e750d
commit b259046
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/dos/dos_keyboard_layout.cpp b/src/dos/dos_keyboard_layout.cpp
@@ -1387,15 +1387,18 @@ Bitu DOS_LoadKeyboardLayout(const char * layoutname, int32_t codepage, const cha
 		return kerrcode;
 	}
 	// ...else keyboard layout loaded successfully, change codepage accordingly
-	kerrcode=temp_layout->read_codepage_file(codepagefile, codepage);
-	if (kerrcode) {
-		delete temp_layout;
-		return kerrcode;
-	}
+    if(!CheckDBCSCP(codepage)){
+        kerrcode = temp_layout->read_codepage_file(codepagefile, codepage);
+        if(kerrcode) {
+            delete temp_layout;
+            return kerrcode;
+        }
+    }
 	// Everything went fine, switch to new layout
     delete loaded_layout;
     loaded_layout=temp_layout;
-	return KEYB_NOERROR;
+    dos.loaded_codepage = codepage;
+    return KEYB_NOERROR;
 }
 
 Bitu DOS_SwitchKeyboardLayout(const char* new_layout, int32_t& tried_cp) {
@@ -1421,7 +1424,9 @@ Bitu DOS_ChangeKeyboardLayout(const char* layoutname, int32_t codepage) {
         return kerrcode;
     }
     // Everything went fine, switch to new layout
+    delete loaded_layout;
     loaded_layout = temp_layout;
+    dos.loaded_codepage = codepage;
     return KEYB_NOERROR;
 }
 
@@ -1432,6 +1437,7 @@ Bitu DOS_ChangeCodepage(int32_t codepage, const char* codepagefile) {
         return kerrcode;
     }
     // Everything went fine
+    dos.loaded_codepage = codepage;
     return KEYB_NOERROR;
 }