Fix exit from composer during sending of MSG

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

diff --git a/.cproject b/.cproject
index d0a0591b99e5569c34056f8742b0b53120715006..05084020a91866906264af5c0b22aac94df474b4 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -27,7 +27,7 @@
                                                                <option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.721225116" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" useByScannerDiscovery="false" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.2126605510" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" useByScannerDiscovery="false" valueType="boolean"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.1185085811" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" useByScannerDiscovery="false" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="wearable-4.0-device.core.private.20170519_1_llvm37.armel.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="wearable-4.0-device.core.private.20170522_1_llvm37.armel.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.732942750" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" useByScannerDiscovery="false" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
@@ -166,7 +166,7 @@
                                                                <option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.1213365629" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" useByScannerDiscovery="false" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.1887344732" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" useByScannerDiscovery="false" valueType="boolean"/>
                                                                <option id="sbi.gnu.c.compiler.option.1991353278" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" useByScannerDiscovery="false" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="wearable-4.0-device.core.private.20170519_1_llvm37.armel.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="wearable-4.0-device.core.private.20170522_1_llvm37.armel.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.775346096" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" useByScannerDiscovery="false" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>

diff --git a/src/Composer/Controller/src/MsgBodyFrame.cpp b/src/Composer/Controller/src/MsgBodyFrame.cpp
index a396e55cb6132edda044db5330e7f6858908298c..e13de3712ee52a9940ac98f4476f300c62d2a6b7 100644 (file)
--- a/src/Composer/Controller/src/MsgBodyFrame.cpp
+++ b/src/Composer/Controller/src/MsgBodyFrame.cpp
@@ -357,10 +357,8 @@ void MsgBodyFrame::onSendingPopupBackButtonPressed(Evas_Object *obj, void *event
     if (m_pSendingPopup)
         m_pSendingPopup->destroy();
 
-    if (m_SendInfo.inProgress) {
+    if (m_SendInfo.inProgress)
         m_SendInfo.reset();
-        getParent().popGroup(*this);
-    }
 }
 
 void MsgBodyFrame::onTurnOffFlightModeClicked(Popup &popup)