modules/gui/qt/dialogs/dialogs_provider.cpp

@@ -127,6 +127,8 @@ QVariant DialogsProvider::getTextDialog(QWidget *parent,
 void DialogsProvider::quit()
 {
     b_isDying = true;
+    assert(qApp);
+    qApp->setProperty("isDying", true);
     libvlc_Quit( vlc_object_instance(p_intf) );
 }
 

modules/gui/qt/maininterface/interface_window_handler.cpp

@@ -138,10 +138,15 @@ InterfaceWindowHandler::InterfaceWindowHandler(qt_intf_t *_p_intf, MainCtx* main
 InterfaceWindowHandler::~InterfaceWindowHandler()
 {
     m_window->removeEventFilter(this);
-    WindowStateHolder::holdOnTop( m_window,  WindowStateHolder::INTERFACE, false );
-    WindowStateHolder::holdFullscreen( m_window,  WindowStateHolder::INTERFACE, false );
     /* Save this size */
     QVLCTools::saveWindowPosition(getSettings(), m_window);
+    assert(qApp);
+    if (!qApp->property("isDying").toBool())
+    {
+        // If application is dying, we don't need to adjust the state
+        WindowStateHolder::holdOnTop( m_window,  WindowStateHolder::INTERFACE, false );
+        WindowStateHolder::holdFullscreen( m_window,  WindowStateHolder::INTERFACE, false );
+    }
 }
 
 void InterfaceWindowHandler::updateCSDWindowSettings()