Fixed spurious disk restore warning

jeffpar · Dec 14, 2023 · 030fd92 · 030fd92
1 parent 2a05810
commit 030fd92
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/machines/pcx86/modules/v2/debugger.js b/machines/pcx86/modules/v2/debugger.js
@@ -4754,7 +4754,7 @@ export default class Debuggerx86 extends DbgLib {
                                         dbg.printf(MESSAGE.DEBUG + MESSAGE.LOG, "%s.%s: %%%X\n", sVxD, sSymbol, offSymbol);
                                     }
                                 } else {
-                                    // dbg.printf(MESSAGE.DEBUG + MESSAGE.WARNING, "%s.%s (%x) already has symbol: %s\n", sVxD, sSymbol, offSymbol, symbolTable.aOffsets[result][1]);
+                                    // dbg.printf(MESSAGE.DEBUG + MESSAGE.WARNING, "%s.%s (%%%X) already has symbol: %s\n", sVxD, sSymbol, offSymbol, symbolTable.aOffsets[result][1]);
                                     symbolTable.aOffsets[result] = pair;
                                     symbolTable.aSymbols[keySymbol] = {'o': offSymbol, 's': symbolTable.sel};
                                 }

diff --git a/machines/pcx86/modules/v2/disk.js b/machines/pcx86/modules/v2/disk.js
@@ -1024,11 +1024,11 @@ export default class Disk extends Component {
      * addModuleInfo(sector)
      *
      * @this {Disk}
-     * @param {Sector} sector
+     * @param {Sector|null} sector
      */
     addModuleInfo(sector)
     {
-        if (SYMBOLS && sector.file) {
+        if (SYMBOLS && sector && sector.file) {
             let module = sector.file.module;
             if (module) {
                 this.aModules[module.name] = module;

diff --git a/machines/pcx86/releases/2.23/pcx86-uncompiled.js b/machines/pcx86/releases/2.23/pcx86-uncompiled.js
@@ -64830,11 +64830,11 @@ class Disk extends Component {
      * addModuleInfo(sector)
      *
      * @this {Disk}
-     * @param {Sector} sector
+     * @param {Sector|null} sector
      */
     addModuleInfo(sector)
     {
-        if (SYMBOLS && sector.file) {
+        if (SYMBOLS && sector && sector.file) {
             let module = sector.file.module;
             if (module) {
                 this.aModules[module.name] = module;
@@ -79133,7 +79133,7 @@ class Debuggerx86 extends DbgLib {
                                         dbg.printf(MESSAGE.DEBUG + MESSAGE.LOG, "%s.%s: %%%X\n", sVxD, sSymbol, offSymbol);
                                     }
                                 } else {
-                                    // dbg.printf(MESSAGE.DEBUG + MESSAGE.WARNING, "%s.%s (%x) already has symbol: %s\n", sVxD, sSymbol, offSymbol, symbolTable.aOffsets[result][1]);
+                                    // dbg.printf(MESSAGE.DEBUG + MESSAGE.WARNING, "%s.%s (%%%X) already has symbol: %s\n", sVxD, sSymbol, offSymbol, symbolTable.aOffsets[result][1]);
                                     symbolTable.aOffsets[result] = pair;
                                     symbolTable.aSymbols[keySymbol] = {'o': offSymbol, 's': symbolTable.sel};
                                 }

diff --git a/machines/pcx86/releases/2.23/pcx86.js b/machines/pcx86/releases/2.23/pcx86.js
diff --git a/machines/pcx86/releases/2.23/pcx86.js.map b/machines/pcx86/releases/2.23/pcx86.js.map