Commit 5d09f600 authored by Felix Paul Kühne's avatar Felix Paul Kühne

* interaction.c: always show errors through the interaction framework, even if...

* interaction.c: always show errors through the interaction framework, even if the user disabled its usage
* macosx/*: minor clean-up
parent 52679672
......@@ -92,6 +92,7 @@
BOOL nib_interact_errpanel_loaded;
}
- (IBAction)cleanupTable:(id)sender;
- (IBAction)showMessages:(id)sender;
-(void)showPanel;
-(void)addError: (NSString *)o_error withMsg:(NSString *)o_msg;
......
......@@ -1309,7 +1309,6 @@ static VLCMain *_o_sharedMainInstance = nil;
- (void)updateMessageArray
{
int i_start, i_stop;
vlc_value_t quiet;
vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
i_stop = *p_intf->p_sys->p_sub->pi_stop;
......@@ -1363,8 +1362,6 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_msg_arr addObject: [o_msg_color autorelease]];
[o_msg_lock unlock];
var_Get( p_intf->p_vlc, "verbose", &quiet );
}
vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
......
......@@ -75,20 +75,25 @@ int __intf_Interact( vlc_object_t *p_this, interaction_dialog_t *p_dialog )
if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT ) return VLC_EGENERIC;
if( !config_GetInt(p_this, "interact") ) return VLC_EGENERIC;
p_dialog->p_interaction = p_interaction;
p_dialog->p_parent = p_this;
if( p_dialog->i_type == INTERACT_DIALOG_TWOWAY )
if( config_GetInt(p_this, "interact") ||
p_dialog->i_flags & DIALOG_BLOCKING_ERROR ||
p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR )
{
return intf_WaitAnswer( p_interaction, p_dialog );
p_dialog->p_interaction = p_interaction;
p_dialog->p_parent = p_this;
if( p_dialog->i_type == INTERACT_DIALOG_TWOWAY )
{
return intf_WaitAnswer( p_interaction, p_dialog );
}
else
{
p_dialog->i_flags |= DIALOG_GOT_ANSWER;
return intf_Send( p_interaction, p_dialog );
}
}
else
{
p_dialog->i_flags |= DIALOG_GOT_ANSWER;
return intf_Send( p_interaction, p_dialog );
}
return VLC_EGENERIC;
}
/**
......@@ -253,6 +258,7 @@ void __intf_UserFatal( vlc_object_t *p_this,
INTERACT_INIT( p_new );
p_new->psz_title = strdup( psz_title );
p_new->i_type = INTERACT_DIALOG_ONEWAY;
va_start( args, psz_format );
vasprintf( &p_new->psz_description, psz_format, args );
......@@ -281,6 +287,7 @@ void __intf_UserWarn( vlc_object_t *p_this,
INTERACT_INIT( p_new );
p_new->psz_title = strdup( psz_title );
p_new->i_type = INTERACT_DIALOG_ONEWAY;
va_start( args, psz_format );
vasprintf( &p_new->psz_description, psz_format, args );
......
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