Merge pull request #1767 from dpalou/MOBILE-2861

MOBILE-2861 core: Fix error when dismissing a loading modal twice
main
Juan Leyva 2019-02-18 15:08:04 +01:00 committed by GitHub
commit ef4d35e9dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions

View File

@ -1160,8 +1160,21 @@ export class CoreDomUtilsProvider {
}
const loader = this.loadingCtrl.create({
content: text
});
content: text
}),
dismiss = loader.dismiss.bind(loader);
let isDismissed = false;
// Override dismiss to prevent dismissing a modal twice (it can throw an error and cause problems).
loader.dismiss = (data, role, navOptions): Promise<any> => {
if (isDismissed) {
return Promise.resolve();
}
isDismissed = true;
return dismiss(data, role, navOptions);
};
loader.present();