vlc | branch: master | Thomas Guillem <[email protected]> | Tue Sep 5 10:11:43 2017 +0200| [aeffdfc6b9f4b6b1fc1c344f47d7849743f8e3ee] | committer: Thomas Guillem
dvdnav: return an error if DEMUX_NAV_ fails > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aeffdfc6b9f4b6b1fc1c344f47d7849743f8e3ee --- modules/access/dvdnav.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c index 42e7f6d011..f58e5e5f3e 100644 --- a/modules/access/dvdnav.c +++ b/modules/access/dvdnav.c @@ -699,8 +699,9 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); + if( dvdnav_button_activate( p_sys->dvdnav, pci ) != DVDNAV_STATUS_OK ) + return VLC_EGENERIC; ButtonUpdate( p_demux, true ); - dvdnav_button_activate( p_sys->dvdnav, pci ); break; } @@ -708,7 +709,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); - dvdnav_upper_button_select( p_sys->dvdnav, pci ); + if( dvdnav_upper_button_select( p_sys->dvdnav, pci ) != DVDNAV_STATUS_OK ) + return VLC_EGENERIC; break; } @@ -716,7 +718,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); - dvdnav_lower_button_select( p_sys->dvdnav, pci ); + if( dvdnav_lower_button_select( p_sys->dvdnav, pci ) != DVDNAV_STATUS_OK ) + return VLC_EGENERIC; break; } @@ -724,7 +727,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); - dvdnav_left_button_select( p_sys->dvdnav, pci ); + if( dvdnav_left_button_select( p_sys->dvdnav, pci ) != DVDNAV_STATUS_OK ) + return VLC_EGENERIC; break; } @@ -732,7 +736,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); - dvdnav_right_button_select( p_sys->dvdnav, pci ); + if( dvdnav_right_button_select( p_sys->dvdnav, pci ) != DVDNAV_STATUS_OK ) + return VLC_EGENERIC; break; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
