Merge branch 'jb39849' into 'master'

[lipstick] Fix lipstick shutdown. Contributes to JB#39849 See merge request !72
sailfishos · Oct 2, 2017 · fe71225 · fe71225
2 parents 0aeadb2 + 9bfba60
commit fe71225
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/compositor/lipstickcompositor.cpp b/src/compositor/lipstickcompositor.cpp
@@ -117,6 +117,8 @@ LipstickCompositor::~LipstickCompositor()
     disconnect(this, SIGNAL(visibleChanged(bool)), this, SLOT(onVisibleChanged(bool)));
 
     delete m_shaderEffect;
+
+    m_instance = nullptr;
 }
 
 LipstickCompositor *LipstickCompositor::instance()

diff --git a/src/homeapplication.cpp b/src/homeapplication.cpp
@@ -96,8 +96,7 @@ HomeApplication::HomeApplication(int &argc, char **argv, const QString &qmlPath)
     m_touchScreen = new TouchScreen(this);
     connect(m_touchScreen, &TouchScreen::displayStateChanged, this, &HomeApplication::displayStateChanged);
 
-    // Create screen lock logic - not parented to "this" since destruction happens too late in that case
-    m_screenLock = new ScreenLock(m_touchScreen);
+    m_screenLock = new ScreenLock(m_touchScreen, this);
     LipstickSettings::instance()->setScreenLock(m_screenLock);
     new ScreenLockAdaptor(m_screenLock);
 
@@ -107,7 +106,7 @@ HomeApplication::HomeApplication(int &argc, char **argv, const QString &qmlPath)
     NotificationManager::instance();
     new NotificationPreviewPresenter(m_screenLock, deviceLock, this);
 
-    m_volumeControl = new VolumeControl;
+    m_volumeControl = new VolumeControl(this);
     new BatteryNotifier(this);
     new ThermalNotifier(this);
     m_usbModeSelector = new USBModeSelector(deviceLock, this);
@@ -192,10 +191,8 @@ HomeApplication::~HomeApplication()
 
     emit aboutToDestroy();
 
-    delete m_volumeControl;
-    delete m_screenLock;
     delete m_mainWindowInstance;
-    delete m_qmlEngine;
+    m_mainWindowInstance = nullptr;
 }
 
 HomeApplication *HomeApplication::instance()