Merge branch 'master' into gh-pages

2017-06-22 16:06:57 -07:00 · 2017-06-22 16:06:57 -07:00 · dc6c40a78e
commit dc6c40a78e
parent 4add2dc408 3ba6f0e047
8 changed files with 230 additions and 228 deletions
--- a/docs/pcx86/examples/pcx86-dbg.js
+++ b/docs/pcx86/examples/pcx86-dbg.js
--- a/docs/pcx86/examples/pcx86.js
+++ b/docs/pcx86/examples/pcx86.js
--- a/modules/pcx86/lib/computer.js
+++ b/modules/pcx86/lib/computer.js
@ -680,7 +680,8 @@ class Computer extends Component {
                 */
                if (!component.powerUp(data, fRepower) && data) {

-                    Component.error("Unable to restore state for " + component.type);
+                    component.notice("Unable to restore hardware state");
+
                    /*
                     * If this is a resume error for a machine that also has a predefined state
                     * AND we're not restoring from that state, then throw away the current state,
--- a/versions/pcx86/1.35.1/pcx86-dbg.js
+++ b/versions/pcx86/1.35.1/pcx86-dbg.js
--- a/versions/pcx86/1.35.1/pcx86-dbg.map
+++ b/versions/pcx86/1.35.1/pcx86-dbg.map
--- a/versions/pcx86/1.35.1/pcx86-uncompiled.js
+++ b/versions/pcx86/1.35.1/pcx86-uncompiled.js
@ -74352,7 +74352,8 @@ class Computer extends Component {
                 */
                if (!component.powerUp(data, fRepower) && data) {

-                    Component.error("Unable to restore state for " + component.type);
+                    component.notice("Unable to restore hardware state");
+
                    /*
                     * If this is a resume error for a machine that also has a predefined state
                     * AND we're not restoring from that state, then throw away the current state,
--- a/versions/pcx86/1.35.1/pcx86.js
+++ b/versions/pcx86/1.35.1/pcx86.js
--- a/versions/pcx86/1.35.1/pcx86.map
+++ b/versions/pcx86/1.35.1/pcx86.map