Avoid nesting in worker.js

Author: kleisauke

src/worker.js

@@ -225,54 +225,52 @@ this.onmessage = function(e) {
 #endif
           Module['PThread'].threadExit(result);
       } catch(ex) {
-        if (ex != 'unwind') {
+        if (ex == 'unwind') {
 #if ASSERTIONS
-          // FIXME(sbc): Figure out if this is still needed or useful.  Its not
-          // clear to me how this check could ever fail.  In order to get into
-          // this try/catch block at all we have already called bunch of
-          // functions on `Module`.. why is this one special?
-          if (typeof(Module['_emscripten_futex_wake']) !== "function") {
-            err("Thread Initialisation failed.");
-            throw ex;
-          }
+          // keep the pthread alive for asynchronous events.
+          err('Pthread 0x' + Module['_pthread_self']().toString(16) + ' completed its pthread main entry point with an unwind, keeping the pthread worker alive for asynchronous operation.');
 #endif
-          // ExitStatus not present in MINIMAL_RUNTIME
-#if !MINIMAL_RUNTIME
-          if (ex instanceof Module['ExitStatus']) {
-            if (Module['getNoExitRuntime']()) {
+          return;
+        }
 #if ASSERTIONS
-              err('Pthread 0x' + Module['_pthread_self']().toString(16) + ' called exit(), staying alive due to noExitRuntime.');
+        // FIXME(sbc): Figure out if this is still needed or useful.  Its not
+        // clear to me how this check could ever fail.  In order to get into
+        // this try/catch block at all we have already called bunch of
+        // functions on `Module`.. why is this one special?
+        if (typeof(Module['_emscripten_futex_wake']) !== "function") {
+          err("Thread Initialisation failed.");
+          throw ex;
+        }
 #endif
-            } else {
+        // ExitStatus not present in MINIMAL_RUNTIME
+#if !MINIMAL_RUNTIME
+        if (ex instanceof Module['ExitStatus']) {
+          if (Module['getNoExitRuntime']()) {
 #if ASSERTIONS
-              err('Pthread 0x' + Module['_pthread_self']().toString(16) + ' called exit(), calling threadExit.');
+            err('Pthread 0x' + Module['_pthread_self']().toString(16) + ' called exit(), staying alive due to noExitRuntime.');
 #endif
-              Module['PThread'].threadExit(ex.status);
-            }
-          }
-          else
+          } else {
+#if ASSERTIONS
+            err('Pthread 0x' + Module['_pthread_self']().toString(16) + ' called exit(), calling threadExit.');
 #endif
-          {
-            Module['PThread'].threadExit(-2);
-            throw ex;
+            Module['PThread'].threadExit(ex.status);
           }
-#if ASSERTIONS
-        } else {
-          // else e == 'unwind', and we should fall through here and keep the pthread alive for asynchronous events.
-          err('Pthread 0x' + Module['_pthread_self']().toString(16) + ' completed its pthread main entry point with an unwind, keeping the pthread worker alive for asynchronous operation.');
+        }
+        else
 #endif
+        {
+          Module['PThread'].threadExit(-2);
+          throw ex;
         }
       }
     } else if (e.data.cmd === 'cancel') { // Main thread is asking for a pthread_cancel() on this thread.
-      if (Module['_pthread_self']()) {
+      if (Module['_pthread_self']())
         Module['PThread'].threadExit(-1/*PTHREAD_CANCELED*/);
-      }
     } else if (e.data.target === 'setimmediate') {
       // no-op
     } else if (e.data.cmd === 'processThreadQueue') {
-      if (Module['_pthread_self']()) { // If this thread is actually running?
+      if (Module['_pthread_self']()) // If this thread is actually running?
         Module['_emscripten_current_thread_process_queued_calls']();
-      }
     } else {
       err('worker.js received unknown command ' + e.data.cmd);
       err(e.data);