1 files changed, 2 insertions, 2 deletions
diff --git a/src/jsifier.js b/src/jsifier.js
index d4d60cee..8b3c9683 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -620,7 +620,7 @@ function JSify(data, functionsOnly, givenFunctions) {
             } // otherwise, should have been set before!
             if (func.setjmpTable) {
               var setjmpTable = {};
-              ret += indent + 'var setjmped = false;'; // set to true if we setjmp in this invocation
+              ret += indent + 'var mySetjmpIds = {};\n';
               ret += indent + 'var setjmpTable = {';
               func.setjmpTable.forEach(function(triple) { // original label, label we created for right after the setjmp, variable setjmp result goes into
                 ret += '"' + getLabelId(triple[0]) + '": ' + 'function(value) { label = ' + getLabelId(triple[1]) + '; ' + triple[2] + ' = value },';
@@ -639,7 +639,7 @@ function JSify(data, functionsOnly, givenFunctions) {
             }).join('\n');
             ret += '\n' + indent + '  default: assert(0, "bad label: " + label);\n' + indent + '}';
             if (func.setjmpTable) {
-              ret += ' } catch(e) { if (!setjmped) throw(e); setjmped = false; if (!e.longjmp) throw(e); setjmpTable[e.label](e.value) }';
+              ret += ' } catch(e) { if (!e.longjmp || !(e.id in mySetjmpIds)) throw(e); setjmpTable[setjmpLabels[e.id]](e.value) }';
             }
           } else {
             ret += (SHOW_LABELS ? indent + '/* ' + block.entries[0] + ' */' : '') + '\n' + getLabelLines(block.labels[0], indent);