From f2efada7b74fc50fb72f5dd0d315c8d363746340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Fri, 7 Apr 2017 11:29:13 +0200
Subject: [PATCH] [escher] In app, display only one modal at a time

Change-Id: Ic78edbc2f620c84085c0743203aa04f08876cca9
---
 escher/src/app.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/escher/src/app.cpp b/escher/src/app.cpp
index 227beb247..d23f1f14d 100644
--- a/escher/src/app.cpp
+++ b/escher/src/app.cpp
@@ -71,6 +71,9 @@ const Image * App::icon() {
 
 void App::displayModalViewController(ViewController * vc, float verticalAlignment, float horizontalAlignment,
     KDCoordinate topMargin, KDCoordinate leftMargin, KDCoordinate bottomMargin, KDCoordinate rightMargin) {
+  if (m_modalViewController.isDisplayingModal()) {
+    m_modalViewController.dismissModalViewController();
+  }
   m_modalViewController.displayModalViewController(vc, verticalAlignment, horizontalAlignment, topMargin, leftMargin, bottomMargin, rightMargin);
 }