Skip to content

V
vlc-gpu
Commit a0b49d79 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

fb: Cleanup properly after failing OpenDisplay.

parent 5d40c7d4
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 21 deletions
modules/video_output/fb.c
View file @ a0b49d79
...@@ -361,15 +361,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -361,15 +361,7 @@ static int Create( vlc_object_t *p_this )
if( OpenDisplay( p_vout ) ) if( OpenDisplay( p_vout ) )
{ {
if( p_sys->b_tty ) Destroy( VLC_OBJECT(p_vout) );
{
ioctl( p_sys->i_tty, VT_SETMODE, &p_vout->p_sys->vt_mode );
sigaction( SIGUSR1, &p_vout->p_sys->sig_usr1, NULL );
sigaction( SIGUSR2, &p_vout->p_sys->sig_usr2, NULL );
tcsetattr(0, 0, &p_vout->p_sys->old_termios);
TextMode( p_sys->i_tty );
}
free( p_vout->p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -959,21 +951,24 @@ static void CloseDisplay( vout_thread_t *p_vout ) ...@@ -959,21 +951,24 @@ static void CloseDisplay( vout_thread_t *p_vout )
munmap( p_vout->p_sys->p_video, p_vout->p_sys->i_page_size ); munmap( p_vout->p_sys->p_video, p_vout->p_sys->i_page_size );
} }
/* Restore palette */ if( p_vout->p_sys->i_fd >= 0 )
if( p_vout->p_sys->var_info.bits_per_pixel == 8 )
{ {
ioctl( p_vout->p_sys->i_fd, /* Restore palette */
FBIOPUTCMAP, &p_vout->p_sys->fb_cmap ); if( p_vout->p_sys->var_info.bits_per_pixel == 8 )
free( p_vout->p_sys->p_palette ); {
p_vout->p_sys->p_palette = NULL; ioctl( p_vout->p_sys->i_fd,
} FBIOPUTCMAP, &p_vout->p_sys->fb_cmap );
free( p_vout->p_sys->p_palette );
p_vout->p_sys->p_palette = NULL;
}
/* Restore fb config */ /* Restore fb config */
ioctl( p_vout->p_sys->i_fd, ioctl( p_vout->p_sys->i_fd,
FBIOPUT_VSCREENINFO, &p_vout->p_sys->old_info ); FBIOPUT_VSCREENINFO, &p_vout->p_sys->old_info );
/* Close fb */ /* Close fb */
close( p_vout->p_sys->i_fd ); close( p_vout->p_sys->i_fd );
}
} }
/***************************************************************************** /*****************************************************************************
......
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