Merge remote-tracking branch 'upstream/master' into omega-hotfix

This commit is contained in:
Quentin Guidée
2020-02-20 23:41:50 +01:00
18 changed files with 92 additions and 40 deletions

View File

@@ -60,7 +60,7 @@ App::App(Snapshot * snapshot) :
void App::willBecomeInactive() {
if (m_modalViewController.isDisplayingModal()) {
m_modalViewController.dismissModalViewController();
m_modalViewController.dismissModalViewController(true);
}
if (inputViewController()->isDisplayingModal()) {
inputViewController()->abortEditionAndDismiss();