From 254db96f5e5de4d371ed663d8cc9065ccdd12faf Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Sat, 8 May 2021 11:40:57 +0300
Subject: [PATCH] setingsdialog:delete dialogs on close

---
 app/settings/detailsdialog/detailsdialog.cpp               | 1 +
 app/settings/exporttemplatedialog/exporttemplatedialog.cpp | 4 ++++
 app/settings/settingsdialog/settingsdialog.cpp             | 4 ++--
 app/settings/settingsdialog/tablayoutshandler.cpp          | 2 --
 app/settings/viewsdialog/viewsdialog.cpp                   | 1 +
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/settings/detailsdialog/detailsdialog.cpp b/app/settings/detailsdialog/detailsdialog.cpp
index 282e42617..05d26dae8 100644
--- a/app/settings/detailsdialog/detailsdialog.cpp
+++ b/app/settings/detailsdialog/detailsdialog.cpp
@@ -36,6 +36,7 @@ DetailsDialog::DetailsDialog(SettingsDialog *parent, Controller::Layouts *contro
       m_layoutsController(controller),
       m_storage(KConfigGroup(KSharedConfig::openConfig(),"LatteSettingsDialog").group("DetailsDialog"))
 {
+    setAttribute(Qt::WA_DeleteOnClose, true);
     loadConfig();
 
     //! first we need to setup the ui
diff --git a/app/settings/exporttemplatedialog/exporttemplatedialog.cpp b/app/settings/exporttemplatedialog/exporttemplatedialog.cpp
index 134c3d5bf..e0f3287a2 100644
--- a/app/settings/exporttemplatedialog/exporttemplatedialog.cpp
+++ b/app/settings/exporttemplatedialog/exporttemplatedialog.cpp
@@ -37,11 +37,13 @@ ExportTemplateDialog::ExportTemplateDialog(QDialog *parent)
     : GenericDialog(parent),
       m_ui(new Ui::ExportTemplateDialog)
 {
+    setAttribute(Qt::WA_DeleteOnClose, true);
 }
 
 ExportTemplateDialog::ExportTemplateDialog(SettingsDialog *parent, const Data::Layout &layout)
     : ExportTemplateDialog(parent)
 {
+    setAttribute(Qt::WA_DeleteOnClose, true);
     m_corona = parent->corona();
 
     init();
@@ -54,6 +56,7 @@ ExportTemplateDialog::ExportTemplateDialog(SettingsDialog *parent, const Data::L
 ExportTemplateDialog::ExportTemplateDialog(ViewsDialog *parent, const Data::View &view)
     : ExportTemplateDialog(parent)
 {
+    setAttribute(Qt::WA_DeleteOnClose, true);
     m_corona = parent->corona();
 
     init();
@@ -67,6 +70,7 @@ ExportTemplateDialog::ExportTemplateDialog(Latte::View *view)
     : GenericDialog(nullptr),
       m_ui(new Ui::ExportTemplateDialog)/*this is necessary, in order to create the ui*/
 {
+    setAttribute(Qt::WA_DeleteOnClose, true);
     m_corona = qobject_cast<Latte::Corona *>(view->corona());
 
     init();
diff --git a/app/settings/settingsdialog/settingsdialog.cpp b/app/settings/settingsdialog/settingsdialog.cpp
index 4ab8b800b..db6818532 100644
--- a/app/settings/settingsdialog/settingsdialog.cpp
+++ b/app/settings/settingsdialog/settingsdialog.cpp
@@ -58,11 +58,11 @@ SettingsDialog::SettingsDialog(QWidget *parent, Latte::Corona *corona)
       m_ui(new Ui::SettingsDialog),
       m_corona(corona),
       m_storage(KConfigGroup(KSharedConfig::openConfig(),"LatteSettingsDialog"))
-{    
+{
+    setAttribute(Qt::WA_DeleteOnClose, true);
     setAcceptDrops(true);
     m_ui->setupUi(this);
 
-    setAttribute(Qt::WA_DeleteOnClose, true);
     //setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
 
     //! load window size
diff --git a/app/settings/settingsdialog/tablayoutshandler.cpp b/app/settings/settingsdialog/tablayoutshandler.cpp
index 718ccd8f3..3984f4d68 100644
--- a/app/settings/settingsdialog/tablayoutshandler.cpp
+++ b/app/settings/settingsdialog/tablayoutshandler.cpp
@@ -736,7 +736,6 @@ void TabLayouts::showDetailsDialog()
     auto detailsDlg = new Settings::Dialog::DetailsDialog(m_parentDialog, m_layoutsController);
 
     detailsDlg->exec();
-    detailsDlg->deleteLater();
 }
 
 void TabLayouts::showViewsDialog()
@@ -757,7 +756,6 @@ void TabLayouts::showViewsDialog()
     m_isViewsDialogVisible = true;
     viewsDlg->exec();
     m_isViewsDialogVisible = false;
-    viewsDlg->deleteLater();
 }
 
 void TabLayouts::onLayoutFilesDropped(const QStringList &paths)
diff --git a/app/settings/viewsdialog/viewsdialog.cpp b/app/settings/viewsdialog/viewsdialog.cpp
index 86568e797..580300cbf 100644
--- a/app/settings/viewsdialog/viewsdialog.cpp
+++ b/app/settings/viewsdialog/viewsdialog.cpp
@@ -36,6 +36,7 @@ ViewsDialog::ViewsDialog(SettingsDialog *parent, Controller::Layouts *controller
       m_layoutsController(controller),
       m_storage(KConfigGroup(KSharedConfig::openConfig(),"LatteSettingsDialog").group("ViewsDialog"))
 {
+    setAttribute(Qt::WA_DeleteOnClose, true);
     loadConfig();
 
     //! first we need to setup the ui