* check for p_vout before accessing it. (quit before playing would cause a crash as of late)

4c40a909 · Derk-Jan Hartman · 209a5a3a · 4c40a909
Commit 4c40a909 authored Jun 27, 2004 by Derk-Jan Hartman
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

modules/control/hotkeys.c modules/control/hotkeys.c +6 -3

No files found.
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -639,9 +639,12 @@ static void ClearChannels( intf_thread_t *p_intf, vout_thread_t *p_vout )
 {
    int i;
-    vout_ClearOSDChannel( p_vout, DEFAULT_CHAN );
+    if( p_vout )
-    for( i = 0; i < CHANNELS_NUMBER; i++ )
    {
-        vout_ClearOSDChannel( p_vout, p_intf->p_sys->p_channels[ i ] );
+        vout_ClearOSDChannel( p_vout, DEFAULT_CHAN );
+        for( i = 0; i < CHANNELS_NUMBER; i++ )
+        {
+            vout_ClearOSDChannel( p_vout, p_intf->p_sys->p_channels[ i ] );
+        }
    }
 }