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

macosx: prevent VLC from crashing on quit while playing by adding additional checks

parent 31a9ab87
...@@ -13,9 +13,10 @@ Security updates: ...@@ -13,9 +13,10 @@ Security updates:
Mac OS X Interface: Mac OS X Interface:
* Corrected fullscreen behavior on multi-screen setups * Corrected fullscreen behavior on multi-screen setups
* Improved behavior of the Preferences window * Improved behavior of the Preferences window
* VLC no longer crashes on quit while playing
Localisation: Localization:
* Update Romanian and Polish languages * Updated Romanian and Polish translations
Changes between 0.8.6c and 0.8.6d: Changes between 0.8.6c and 0.8.6d:
---------------------------------- ----------------------------------
......
...@@ -191,10 +191,14 @@ static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable, ...@@ -191,10 +191,14 @@ static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val, void *param ) vlc_value_t old_val, vlc_value_t new_val, void *param )
{ {
intf_thread_t * p_intf = VLCIntf; intf_thread_t * p_intf = VLCIntf;
p_intf->p_sys->b_playlist_update = VLC_TRUE; if( p_intf && !p_intf->b_die )
p_intf->p_sys->b_intf_update = VLC_TRUE; {
p_intf->p_sys->b_playmode_update = VLC_TRUE; p_intf->p_sys->b_playlist_update = VLC_TRUE;
return VLC_SUCCESS; p_intf->p_sys->b_intf_update = VLC_TRUE;
p_intf->p_sys->b_playmode_update = VLC_TRUE;
return VLC_SUCCESS;
}
return VLC_EGENERIC;
} }
/***************************************************************************** /*****************************************************************************
......
...@@ -413,8 +413,9 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -413,8 +413,9 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
- (void)manage - (void)manage
{ {
/* Disable Screensaver, when we're playing something, but allow it on pause */ /* Disable Screensaver, when we're playing something, but allow it on pause */
if( VLCIntf->p_sys->i_play_status == PLAYING_S ) if( VLCIntf->p_sys && !VLCIntf->b_die )
UpdateSystemActivity( UsrActivity ); if( VLCIntf->p_sys->i_play_status == PLAYING_S )
UpdateSystemActivity( UsrActivity );
} }
- (id)getWindow - (id)getWindow
......
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