Skip to content

Commit

Permalink
fix: avoid isPromise check when handler return value is Vue instance
Browse files Browse the repository at this point in the history
  • Loading branch information
yyx990803 authored and Lostlover committed Dec 10, 2019
1 parent 3895da4 commit c16f928
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/core/util/error.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export function invokeWithErrorHandling (
let res
try {
res = args ? handler.apply(context, args) : handler.call(context)
if (isPromise(res)) {
if (res && !res._isVue && isPromise(res)) {
res.catch(e => handleError(e, vm, info + ` (Promise/async)`))
}
} catch (e) {
Expand Down

0 comments on commit c16f928

Please sign in to comment.