Commit 2099e457 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: comments.

parent 7f4548c6
...@@ -274,8 +274,10 @@ MainInterface::~MainInterface() ...@@ -274,8 +274,10 @@ MainInterface::~MainInterface()
{ {
msg_Dbg( p_intf, "Destroying the main interface" ); msg_Dbg( p_intf, "Destroying the main interface" );
/* Unsure we hide the videoWidget before destroying it */
if( videoIsActive ) videoWidget->hide(); if( videoIsActive ) videoWidget->hide();
/* Save playlist state */
if( playlistWidget ) if( playlistWidget )
{ {
if( !isDocked() ) if( !isDocked() )
...@@ -284,12 +286,14 @@ MainInterface::~MainInterface() ...@@ -284,12 +286,14 @@ MainInterface::~MainInterface()
delete playlistWidget; delete playlistWidget;
} }
/* Be sure to kill the actionsManager... FIXME */
ActionsManager::killInstance(); ActionsManager::killInstance();
/* Delete the FSC controller */
if( fullscreenControls ) delete fullscreenControls; if( fullscreenControls ) delete fullscreenControls;
/* Save states */
settings->beginGroup( "MainWindow" ); settings->beginGroup( "MainWindow" );
settings->setValue( "pl-dock-status", (int)i_pl_dock ); settings->setValue( "pl-dock-status", (int)i_pl_dock );
settings->setValue( "playlist-visible", (int)playlistVisible ); settings->setValue( "playlist-visible", (int)playlistVisible );
settings->setValue( "adv-controls", settings->setValue( "adv-controls",
...@@ -301,12 +305,13 @@ MainInterface::~MainInterface() ...@@ -301,12 +305,13 @@ MainInterface::~MainInterface()
if( bgWidget ) if( bgWidget )
settings->setValue( "backgroundSize", bgWidget->size() ); settings->setValue( "backgroundSize", bgWidget->size() );
/* Save this size */
QVLCTools::saveWidgetPosition(settings, this); QVLCTools::saveWidgetPosition(settings, this);
settings->endGroup(); settings->endGroup();
var_DelCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
/* Unregister callback for the intf-popupmenu variable */ /* Unregister callbacks */
var_DelCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
var_DelCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf ); var_DelCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
interaction_Unregister( p_intf ); interaction_Unregister( p_intf );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment