🐛 fix a bug of update config

need the update of the vscode-dosbox

Author: xsro

package.json

@@ -3,7 +3,7 @@
   "displayName": "MASM/TASM",
   "publisher": "xsro",
   "description": "run MASM/TASM assembly in DOSBox 汇编语言开发插件",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "keywords": [
     "dosbox",
     "16位",
@@ -226,7 +226,7 @@
               "support": [
                 "jsdos",
                 "dosbox",
-                "dosboxX",
+                "dosbox-x",
                 "msdos player"
               ]
             }
@@ -239,7 +239,7 @@
           "enum": [
             "jsdos",
             "dosbox",
-            "dosboxX",
+            "dosbox-x",
             "msdos player"
           ],
           "enumDescriptions": [
@@ -287,8 +287,8 @@
             "type": "string"
           },
           "default": {
-            "SDL.windowresolution": "1024x640",
-            "SDL.output": "opengl"
+            "sdl.windowresolution": "1024x640",
+            "sdl.output": "overlay"
           },
           "markdownDescription": "%config.boxconfig.description%"
         },
@@ -297,10 +297,6 @@
           "additionalProperties": {
             "type": "string"
           },
-          "default": {
-            "SDL.windowresolution": "1024x640",
-            "SDL.output": "opengl"
-          },
           "markdownDescription": "%config.boxXconfig.description%"
         }
       }

src/ASM/main.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode';
 import * as path from 'path';
 import * as nodefs from 'fs';
 
-import { API } from './vscode-dosbox';
+import { API, Dosbox } from './vscode-dosbox';
 import * as statusBar from './statusBar';
 import * as Diag from '../diagnose/main';
 import * as conf from '../utils/configuration';
@@ -48,6 +48,23 @@ export async function activate(context: vscode.ExtensionContext) {
     const assemblyToolsFolder = vscode.Uri.joinPath(context.globalStorageUri, conf.extConf.asmType);
     const seperateSpaceFolder = vscode.Uri.joinPath(context.globalStorageUri, "workspace");
 
+    function updateDosboxConf(box: Dosbox) {
+        let confSting = "dosbox.config";
+        if (conf.extConf.emulator === conf.DosEmulatorType.dosboxX) {
+            confSting = "dosboxX.config";
+        }
+        if (conf.extConf._conf.has(confSting)) {
+            const dosboxConf: { [id: string]: string } | undefined = conf.extConf._conf.get(confSting);
+            if (dosboxConf) {
+                for (const id in dosboxConf) {
+                    const [section, key] = id.toLowerCase().split('.');
+                    const value = dosboxConf[id];
+                    box.updateConf(section, key, value);
+                }
+            }
+        }
+    }
+
     async function singleFileMode(act: conf.actionType, _uri: vscode.Uri): Promise<AsmResult> {
         logger.channel(actionMessage(act, _uri.fsPath));
 
@@ -130,18 +147,7 @@ export async function activate(context: vscode.ExtensionContext) {
                 }
             }
 
-            const dosboxConf: { [id: string]: string } | undefined =
-                conf.extConf.emulator === conf.DosEmulatorType.dosboxX
-                    ? vscode.workspace.getConfiguration("masmtasm").get("dosbox.config")
-                    : vscode.workspace.getConfiguration("masmtasm").get("dosboxX.config");
-            if (dosboxConf) {
-                for (const id in dosboxConf) {
-                    const [section, key] = id.toLowerCase().split('.');
-                    const value = dosboxConf[id];
-                    box.updateConf(section, key, value);
-                }
-            }
-
+            updateDosboxConf(box);
             box.updateAutoexec(autoexec);
 
             if (act !== conf.actionType.open) {
@@ -375,18 +381,7 @@ export async function activate(context: vscode.ExtensionContext) {
                 }
             }
 
-            const dosboxConf: { [id: string]: string } | undefined =
-                conf.extConf.emulator === conf.DosEmulatorType.dosboxX
-                    ? vscode.workspace.getConfiguration("masmtasm").get("dosbox.config")
-                    : vscode.workspace.getConfiguration("masmtasm").get("dosboxX.config");
-            if (dosboxConf) {
-                for (const id in dosboxConf) {
-                    const [section, key] = id.toLowerCase().split('.');
-                    const value = dosboxConf[id];
-                    box.updateConf(section, key, value);
-                }
-            }
-
+            updateDosboxConf(box);
             box.updateAutoexec(autoexec);
 
             if (act !== conf.actionType.open) {