[vlc-commits] [Git][videolan/vlc][master] qt: cleanup configuration on termination

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
8bf4d272 by Prince Gupta at 2021-07-30T07:27:34+00:00
qt: cleanup configuration on termination

fixes #25902
fixup 7a00ed44fbe19c92778f6beb2ebfc5b5172bde16

- - - - -


1 changed file:

- modules/gui/qt/qt.cpp


Changes:

=====================================
modules/gui/qt/qt.cpp
=====================================
@@ -819,7 +819,7 @@ static void *ThreadCleanup( qt_intf_t *p_intf, CleanupReason cleanupReason )
             open_state = OPEN_STATE_INIT;
     }
 
-    if (p_intf->p_compositor )
+    if ( p_intf->p_compositor )
     {
         if (cleanupReason == CLEANUP_INTF_CLOSED)
         {
@@ -830,6 +830,9 @@ static void *ThreadCleanup( qt_intf_t *p_intf, CleanupReason cleanupReason )
             p_intf->p_compositor->destroyMainInterface();
             p_intf->p_mi = nullptr;
 
+            delete p_intf->mainSettings;
+            p_intf->mainSettings = nullptr;
+
             delete p_intf->p_compositor;
             p_intf->p_compositor = nullptr;
         }
@@ -859,12 +862,6 @@ static void *ThreadCleanup( qt_intf_t *p_intf, CleanupReason cleanupReason )
         delete p_intf->p_mainPlayerController;
         p_intf->p_mainPlayerController = nullptr;
     }
-    /* Delete the configuration. Application has to be deleted after that. */
-    if (p_intf->p_mainPlayerController)
-    {
-        delete p_intf->mainSettings;
-        p_intf->p_mainPlayerController = nullptr;
-    }
 
     /* Delete the application automatically */
     return NULL;



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/8bf4d27263fe957c91655aa0724116830d665c87

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/8bf4d27263fe957c91655aa0724116830d665c87
You're receiving this email because of your account on code.videolan.org.