vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Tue Apr 26 13:47:38 2016 +0200| [35a51c6561e5a0afc66dac66dd2cdbe27aba6582] | committer: Hugo Beauzée-Luyssen
qt: Delete the settings after the MainInputManager The input_manager may want to update the RecentMRLs upon destruction, and needs a valid settings instance to do so > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=35a51c6561e5a0afc66dac66dd2cdbe27aba6582 --- modules/gui/qt/qt.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp index 75e2f50..5aee407 100644 --- a/modules/gui/qt/qt.cpp +++ b/modules/gui/qt/qt.cpp @@ -629,12 +629,12 @@ static void *Thread( void *obj ) /* */ delete p_intf->p_sys->pl_model; - /* Delete the configuration. Application has to be deleted after that. */ - delete p_intf->p_sys->mainSettings; - /* Destroy the MainInputManager */ MainInputManager::killInstance(); + /* Delete the configuration. Application has to be deleted after that. */ + delete p_intf->p_sys->mainSettings; + /* Delete the application automatically */ return NULL; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
