From 0e9e27e7017e3a694b601eff39742e21a0f3cbe1 Mon Sep 17 00:00:00 2001
From: Denis Dolzhenko <d.dolzhenko@samsung.com>
Date: Tue, 18 Oct 2016 16:40:30 +0300
Subject: [PATCH] Fast close of attach panel.

Change-Id: I1912ca3aa6f459370e5ab362d2acae5455e350ab
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>
---
 src/Conversation/AppControl/inc/AttachPanel.h         |  1 +
 src/Conversation/AppControl/src/AttachPanel.cpp       | 16 +++++++++++-----
 src/Conversation/Main/Controller/src/Conversation.cpp |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/Conversation/AppControl/inc/AttachPanel.h b/src/Conversation/AppControl/inc/AttachPanel.h
index 85db965..695ec30 100644
--- a/src/Conversation/AppControl/inc/AttachPanel.h
+++ b/src/Conversation/AppControl/inc/AttachPanel.h
@@ -39,6 +39,7 @@ namespace Msg
 
             void setListener(IAttachPanelListener *l);
             void show(bool value);
+            void reset();
             bool isVisible() const;
 
         private:
diff --git a/src/Conversation/AppControl/src/AttachPanel.cpp b/src/Conversation/AppControl/src/AttachPanel.cpp
index c812b1f..52313f8 100644
--- a/src/Conversation/AppControl/src/AttachPanel.cpp
+++ b/src/Conversation/AppControl/src/AttachPanel.cpp
@@ -40,11 +40,7 @@ AttachPanel::AttachPanel(App &app)
 
 AttachPanel::~AttachPanel()
 {
-    if(m_Handle)
-    {
-        attach_panel_hide(m_Handle);
-        attach_panel_destroy(m_Handle);
-    }
+    reset();
 }
 
 void AttachPanel::setListener(IAttachPanelListener *l)
@@ -64,6 +60,16 @@ void AttachPanel::show(bool value)
         attach_panel_hide(m_Handle);
 }
 
+void AttachPanel::reset()
+{
+    if(m_Handle)
+    {
+        attach_panel_hide(m_Handle);
+        attach_panel_destroy(m_Handle);
+        m_Handle = nullptr;
+    }
+}
+
 bool AttachPanel::isVisible() const
 {
     bool res = false;
diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp
index b6cb08f..de3aa04 100644
--- a/src/Conversation/Main/Controller/src/Conversation.cpp
+++ b/src/Conversation/Main/Controller/src/Conversation.cpp
@@ -1176,7 +1176,7 @@ void Conversation::onHwBackButtonClicked()
     if(sendReadReportIfNeeded())
         return;
 
-    m_AttachPanel.show(false);
+    m_AttachPanel.reset();
     saveDraftMsg();
     pop();
 }
-- 
2.7.4