fix crash when destoying config window

5 years ago · e6ab9385d8
parent dea32cb37a
commit e6ab9385d8
2 changed files with 4 additions and 1 deletions
--- a/app/view/settings/primaryconfigview.cpp
+++ b/app/view/settings/primaryconfigview.cpp
@ -125,7 +125,7 @@ PrimaryConfigView::~PrimaryConfigView()
        delete m_secConfigView;
    }

-    if (m_latteView->indicator()) {
+    if (m_latteView && m_latteView->indicator()) {
        //! destroy indicator config ui when the configuration window is closed
        m_latteView->indicator()->releaseConfigUi();
    }
--- a/app/view/settings/viewsettingsfactory.cpp
+++ b/app/view/settings/viewsettingsfactory.cpp
@ -31,6 +31,9 @@ ViewSettingsFactory::ViewSettingsFactory(QObject *parent)

 ViewSettingsFactory::~ViewSettingsFactory()
 {
+    if (m_primaryConfigView) {
+        delete m_primaryConfigView;
+    }
 }

 ViewPart::PrimaryConfigView *ViewSettingsFactory::primary(Latte::View *view)