TizenRefApp-6633 Active notification displayed when Messages app launched

Change-Id: Id3ff2f1f7a2ed6a5a76c6c7bb3ad3edf3f01b088
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>

diff --git a/src/Common/Controller/src/App.cpp b/src/Common/Controller/src/App.cpp
index 0520240..dd653a7 100644 (file)
--- a/src/Common/Controller/src/App.cpp
+++ b/src/Common/Controller/src/App.cpp
@@ -159,19 +159,25 @@ bool App::isPause() const
 
 void App::pause()
 {
-    m_IsPause = true;
-    for(IAppListener *l : m_Listeners)
-        l->onAppPause();
-    updateActiveNotifPolicy();
-    getPopupManager().onPause();
+    if(!m_IsPause)
+    {
+        m_IsPause = true;
+        for(IAppListener *l : m_Listeners)
+            l->onAppPause();
+        updateActiveNotifPolicy();
+        getPopupManager().onPause();
+    }
 }
 
 void App::resume()
 {
-    m_IsPause = false;
-    updateActiveNotifPolicy();
-    for(IAppListener *l : m_Listeners)
-        l->onAppResume();
+    if(m_IsPause)
+    {
+        m_IsPause = false;
+        updateActiveNotifPolicy();
+        for(IAppListener *l : m_Listeners)
+            l->onAppResume();
+    }
 }
 
 void App::updateActiveNotifPolicy()

diff --git a/src/Common/Controller/src/FrameController.cpp b/src/Common/Controller/src/FrameController.cpp
index 2b35ea3..52ad45f 100644 (file)
--- a/src/Common/Controller/src/FrameController.cpp
+++ b/src/Common/Controller/src/FrameController.cpp
@@ -85,7 +85,7 @@ void FrameController::pause()
 
 void FrameController::resume()
 {
-    if(m_IsPause)
+    if(m_IsPause && !getApp().isPause())
     {
         m_IsPause = false;
         onResume();