fix: make sure global state is restored in the case of an exception i…

…n macrotask callback (#9093)
vuejs · Dec 1, 2018 · b111de4 · b111de4
1 parent 33e669b
commit b111de4
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/core/util/next-tick.js b/src/core/util/next-tick.js
@@ -81,9 +81,11 @@ if (typeof Promise !== 'undefined' && isNative(Promise)) {
 export function withMacroTask (fn: Function): Function {
   return fn._withTask || (fn._withTask = function () {
     useMacroTask = true
-    const res = fn.apply(null, arguments)
-    useMacroTask = false
-    return res
+    try {
+      return fn.apply(null, arguments)
+    } finally {
+      useMacroTask = false    
+    }
   })
 }