Commit 9649c599 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Don't check for impossible error involving object types

parent c3a30a7b
......@@ -445,11 +445,9 @@ ConfigItem::ConfigItem( intf_thread_t * _p_intf, char * name,
}
}
if( !p_module || p_module->i_object_type != VLC_OBJECT_MODULE )
{
if( !p_module )
/* Shouldn't happen */
return;
}
module_config_t * p_item;
p_item = fSubModule ? ((module_t *)p_module->p_parent)->p_config :
......
......@@ -552,7 +552,7 @@ static VLCTreeItem *o_root_item = nil;
if( i_object_category == -1 )
{
p_parser = (module_t *) vlc_object_get( i_object_id );
if( !p_parser || ((vlc_object_t*)p_parser)->i_object_type != VLC_OBJECT_MODULE )
if( !p_parser )
{
/* 0OOoo something went really bad */
return nil;
......
......@@ -509,7 +509,7 @@ void MainInputManager::customEvent( QEvent *event )
}
/* Should be PLItemChanged Event */
if( VLC_OBJECT_INTF == p_intf->i_object_type )
if( VLC_OBJECT_INTF == p_intf->i_object_type ) /* FIXME: don't use object type */
{
vlc_mutex_lock( &p_intf->change_lock );
if( p_input && ( p_input->b_dead || p_input->b_die ) )
......
......@@ -706,11 +706,6 @@ PrefsPanel::PrefsPanel( HWND parent, HINSTANCE hInst, intf_thread_t *_p_intf,
{
/* Get a pointer to the module */
p_module = (module_t *)vlc_object_get( i_object_id );
if( p_module->i_object_type != VLC_OBJECT_MODULE )
{
/* 0OOoo something went really bad */
return;
}
/* Enumerate config options and add corresponding config boxes
* (submodules don't have config options, they are stored in the
......
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