MOBILE-2861 core: Fix error when dismissing a loading modal twice

main
Dani Palou 2019-02-08 15:08:47 +01:00
parent b7d56bf641
commit c9a536f1b5
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();