Skip to content

V
vlc-2-2
Commit 3886a791 authored by Olivier Teulière's avatar Olivier Teulière
Browse files
Options

* skins2/src/skin_main.cpp: Fixed a crash in the preferences, reported by Trax

parent 62f073c8
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 18 deletions
modules/gui/skins2/src/skin_main.cpp
View file @ 3886a791
...@@ -365,16 +365,20 @@ static int onSystrayChange( vlc_object_t *pObj, const char *pVariable, ...@@ -365,16 +365,20 @@ static int onSystrayChange( vlc_object_t *pObj, const char *pVariable,
return VLC_EGENERIC; return VLC_EGENERIC;
} }
AsyncQueue *pQueue = AsyncQueue::instance( pIntf ); // Check that we found the correct interface (same check as for the demux)
if( newVal.b_bool ) if( var_Type( pIntf, "skin-to-load" ) == VLC_VAR_STRING )
{ {
CmdAddInTray *pCmd = new CmdAddInTray( pIntf ); AsyncQueue *pQueue = AsyncQueue::instance( pIntf );
pQueue->push( CmdGenericPtr( pCmd ) ); if( newVal.b_bool )
} {
else CmdAddInTray *pCmd = new CmdAddInTray( pIntf );
{ pQueue->push( CmdGenericPtr( pCmd ) );
CmdRemoveFromTray *pCmd = new CmdRemoveFromTray( pIntf ); }
pQueue->push( CmdGenericPtr( pCmd ) ); else
{
CmdRemoveFromTray *pCmd = new CmdRemoveFromTray( pIntf );
pQueue->push( CmdGenericPtr( pCmd ) );
}
} }
vlc_object_release( pIntf ); vlc_object_release( pIntf );
...@@ -395,16 +399,20 @@ static int onTaskBarChange( vlc_object_t *pObj, const char *pVariable, ...@@ -395,16 +399,20 @@ static int onTaskBarChange( vlc_object_t *pObj, const char *pVariable,
return VLC_EGENERIC; return VLC_EGENERIC;
} }
AsyncQueue *pQueue = AsyncQueue::instance( pIntf ); // Check that we found the correct interface (same check as for the demux)
if( newVal.b_bool ) if( var_Type( pIntf, "skin-to-load" ) == VLC_VAR_STRING )
{ {
CmdAddInTaskBar *pCmd = new CmdAddInTaskBar( pIntf ); AsyncQueue *pQueue = AsyncQueue::instance( pIntf );
pQueue->push( CmdGenericPtr( pCmd ) ); if( newVal.b_bool )
} {
else CmdAddInTaskBar *pCmd = new CmdAddInTaskBar( pIntf );
{ pQueue->push( CmdGenericPtr( pCmd ) );
CmdRemoveFromTaskBar *pCmd = new CmdRemoveFromTaskBar( pIntf ); }
pQueue->push( CmdGenericPtr( pCmd ) ); else
{
CmdRemoveFromTaskBar *pCmd = new CmdRemoveFromTaskBar( pIntf );
pQueue->push( CmdGenericPtr( pCmd ) );
}
} }
vlc_object_release( pIntf ); vlc_object_release( pIntf );
......
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