From 53dd252a8b04d7712614e982b5628add16600267 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Sun, 31 Jul 2016 14:20:34 +0200
Subject: [PATCH] messageviewerplugins: don't create widget just to hide it

Called by ViewerPluginToolManager::closeAllTools() in
ViewerPrivate::resetStateForNewMessage().
---
 .../createeventplugin/viewerplugincreateeventinterface.cpp    | 4 +++-
 .../createnoteplugin/viewerplugincreatenoteinterface.cpp      | 4 +++-
 .../createtodoplugin/viewerplugincreatetodointerface.cpp      | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugins/messageviewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp b/plugins/messageviewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp
index 9f253e43..b79ed4e6 100644
--- a/plugins/messageviewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp
+++ b/plugins/messageviewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp
@@ -64,7 +64,9 @@ void ViewerPluginCreateEventInterface::setMessage(const KMime::Message::Ptr &val
 
 void ViewerPluginCreateEventInterface::closePlugin()
 {
-    widget()->slotCloseWidget();
+    if (mEventEdit) {
+        mEventEdit->slotCloseWidget();
+    }
 }
 
 void ViewerPluginCreateEventInterface::showWidget()
diff --git a/plugins/messageviewerplugins/createnoteplugin/viewerplugincreatenoteinterface.cpp b/plugins/messageviewerplugins/createnoteplugin/viewerplugincreatenoteinterface.cpp
index f7854757..6ddf587a 100644
--- a/plugins/messageviewerplugins/createnoteplugin/viewerplugincreatenoteinterface.cpp
+++ b/plugins/messageviewerplugins/createnoteplugin/viewerplugincreatenoteinterface.cpp
@@ -62,7 +62,9 @@ void ViewerPluginCreatenoteInterface::setMessage(const KMime::Message::Ptr &valu
 
 void ViewerPluginCreatenoteInterface::closePlugin()
 {
-    widget()->slotCloseWidget();
+    if (mNoteEdit) {
+        mNoteEdit->slotCloseWidget();
+    }
 }
 
 Akonadi::Relation ViewerPluginCreatenoteInterface::relatedNoteRelation() const
diff --git a/plugins/messageviewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp b/plugins/messageviewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp
index fd41c3ab..befdd0c1 100644
--- a/plugins/messageviewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp
+++ b/plugins/messageviewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp
@@ -59,7 +59,9 @@ void ViewerPluginCreateTodoInterface::setMessage(const KMime::Message::Ptr &valu
 
 void ViewerPluginCreateTodoInterface::closePlugin()
 {
-    widget()->slotCloseWidget();
+    if (mTodoEdit) {
+        mTodoEdit->slotCloseWidget();
+    }
 }
 
 void ViewerPluginCreateTodoInterface::showWidget()
-- 
GitLab