Let's try to tone down the alerts when 'resume' is set to AUTO (1)

jeffpar · Jun 27, 2017 · 26bf113 · 26bf113
1 parent 66cf6b6
commit 26bf113
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 70 deletions.
diff --git a/docs/pcx86/examples/pcx86-dbg.js b/docs/pcx86/examples/pcx86-dbg.js
diff --git a/docs/pcx86/examples/pcx86.js b/docs/pcx86/examples/pcx86.js
diff --git a/modules/pcx86/lib/computer.js b/modules/pcx86/lib/computer.js
@@ -519,12 +519,11 @@ class Computer extends Component {
                  * may have happened the last time around.
                  */
                 this.stateFailSafe = new State(this, PCX86.APPVERSION, Computer.STATE_FAILSAFE);
+
                 if (this.stateFailSafe.load()) {
-                    if (this.powerReport(stateComputer)) {
+                    if (resume != Computer.RESUME_AUTO && this.powerReport(stateComputer)) {
                         /*
-                         * We already know resume is something other than RESUME_NONE, so we'll go ahead and bump it
-                         * all the way to RESUME_PROMPT, so that the user will be prompted, and if the user declines to
-                         * restore, the state will be removed.
+                         * Prompt the user; if they decline to restore, the state will be removed.
                          */
                         resume = Computer.RESUME_PROMPT;
                     }

diff --git a/modules/pcx86/lib/rom.js b/modules/pcx86/lib/rom.js
@@ -196,7 +196,7 @@ class ROM extends Component {
     doneLoad(sURL, sROMData, nErrorCode)
     {
         if (nErrorCode) {
-            this.notice("Unable to load system ROM (error " + nErrorCode + ": " + sURL + ")");
+            this.notice("Unable to load system ROM (error " + nErrorCode + ": " + sURL + ")", nErrorCode < 0);
             return;
         }
 

diff --git a/versions/pcx86/1.35.1/pcx86-dbg.js b/versions/pcx86/1.35.1/pcx86-dbg.js
diff --git a/versions/pcx86/1.35.1/pcx86-dbg.map b/versions/pcx86/1.35.1/pcx86-dbg.map
diff --git a/versions/pcx86/1.35.1/pcx86-uncompiled.js b/versions/pcx86/1.35.1/pcx86-uncompiled.js
@@ -43155,7 +43155,7 @@ class ROM extends Component {
     doneLoad(sURL, sROMData, nErrorCode)
     {
         if (nErrorCode) {
-            this.notice("Unable to load system ROM (error " + nErrorCode + ": " + sURL + ")");
+            this.notice("Unable to load system ROM (error " + nErrorCode + ": " + sURL + ")", nErrorCode < 0);
             return;
         }
 
@@ -74369,12 +74369,11 @@ class Computer extends Component {
                  * may have happened the last time around.
                  */
                 this.stateFailSafe = new State(this, PCX86.APPVERSION, Computer.STATE_FAILSAFE);
+
                 if (this.stateFailSafe.load()) {
-                    if (this.powerReport(stateComputer)) {
+                    if (resume != Computer.RESUME_AUTO && this.powerReport(stateComputer)) {
                         /*
-                         * We already know resume is something other than RESUME_NONE, so we'll go ahead and bump it
-                         * all the way to RESUME_PROMPT, so that the user will be prompted, and if the user declines to
-                         * restore, the state will be removed.
+                         * Prompt the user; if they decline to restore, the state will be removed.
                          */
                         resume = Computer.RESUME_PROMPT;
                     }

diff --git a/versions/pcx86/1.35.1/pcx86.js b/versions/pcx86/1.35.1/pcx86.js
diff --git a/versions/pcx86/1.35.1/pcx86.map b/versions/pcx86/1.35.1/pcx86.map