From 095dc50f1ec84250e89ad104aa9fa496554f4cd6 Mon Sep 17 00:00:00 2001
From: Johan Smith Agudelo Rodriguez <audoban@openmailbox.org>
Date: Sun, 12 Mar 2017 12:05:02 -0500
Subject: [PATCH] fix restore connfig for raiseOnDesktop/ActivityChange

---
 app/dockview.cpp                     | 5 ++---
 app/visibilitymanager.cpp            | 9 +++++----
 containment/contents/config/main.xml | 7 -------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/dockview.cpp b/app/dockview.cpp
index 89b418b6a..d187d66c1 100644
--- a/app/dockview.cpp
+++ b/app/dockview.cpp
@@ -132,9 +132,8 @@ DockView::~DockView()
         m_configView->deleteLater();
     }*/
 
-    if (m_visibility) {
-        m_visibility->deleteLater();
-    }
+    if (m_visibility)
+        delete m_visibility;
 }
 
 void DockView::init()
diff --git a/app/visibilitymanager.cpp b/app/visibilitymanager.cpp
index 18f0186ef..94777455b 100644
--- a/app/visibilitymanager.cpp
+++ b/app/visibilitymanager.cpp
@@ -66,6 +66,7 @@ VisibilityManagerPrivate::~VisibilityManagerPrivate()
 {
     wm->removeDockStruts(view->winId());
     wm->removeDock(view->winId());
+    saveConfig();
 }
 
 inline void VisibilityManagerPrivate::setMode(Dock::Visibility mode)
@@ -229,14 +230,12 @@ void VisibilityManagerPrivate::setBlockHiding(bool blockHiding)
 inline void VisibilityManagerPrivate::setTimerShow(int msec)
 {
     timerShow.setInterval(msec);
-    saveConfig();
     emit q->timerShowChanged();
 }
 
 inline void VisibilityManagerPrivate::setTimerHide(int msec)
 {
     timerHide.setInterval(msec);
-    saveConfig();
     emit q->timerHideChanged();
 }
 
@@ -415,8 +414,8 @@ inline void VisibilityManagerPrivate::saveConfig()
     config.writeEntry("visibility", static_cast<int>(mode));
     config.writeEntry("timerShow", timerShow.interval());
     config.writeEntry("timerHide", timerHide.interval());
-    config.writeEntry("raiseOnDesktopChange", false);
-    config.writeEntry("raiseOnActivityChange", false);
+    config.writeEntry("raiseOnDesktopChange", raiseOnDesktopChange);
+    config.writeEntry("raiseOnActivityChange", raiseOnActivityChange);
     view->containment()->configNeedsSaving();
 }
 
@@ -504,6 +503,8 @@ VisibilityManager::VisibilityManager(PlasmaQuick::ContainmentView *view)
 
 VisibilityManager::~VisibilityManager()
 {
+    qDebug() << "VisibilityManager deleting...";
+    delete d;
 }
 
 Dock::Visibility VisibilityManager::mode() const
diff --git a/containment/contents/config/main.xml b/containment/contents/config/main.xml
index fbcb7cbc0..36e8b60ae 100644
--- a/containment/contents/config/main.xml
+++ b/containment/contents/config/main.xml
@@ -114,12 +114,5 @@
     <entry name="showOnlyCurrentActivity" type="Bool">
       <default>true</default>
     </entry>
-    <entry name="raiseOnDesktopChange" type="Bool">
-      <default>false</default>
-    </entry>
-    <entry name="raiseOnActivityChange" type="Bool">
-      <default>false</default>
-    </entry>
-
   </group>
 </kcfg>