More cases were p_md was not checked in Mozilla toolbar code.
authorJean-Paul Saman <jpsaman@videolan.org>
Tue, 4 Mar 2008 21:09:21 +0000 (22:09 +0100)
committerJean-Paul Saman <jpsaman@videolan.org>
Tue, 4 Mar 2008 21:10:00 +0000 (22:10 +0100)
projects/mozilla/vlcshell.cpp

index 2ed67a4..13e93ad 100644 (file)
@@ -820,7 +820,7 @@ static void ControlHandler( Widget w, XtPointer closure, XEvent *event )
                 libvlc_exception_clear( &ex );
 
                 f_length = (float)f_length *
                 libvlc_exception_clear( &ex );
 
                 f_length = (float)f_length *
-                        ( ((float)i_xPos-4 ) / ( ((float)i_width-8)/100) );
+                           ( ((float)i_xPos-4 ) / ( ((float)i_width-8)/100) );
 
                 libvlc_exception_init( &ex );
                 libvlc_media_instance_set_time( p_md, f_length, &ex );
 
                 libvlc_exception_init( &ex );
                 libvlc_media_instance_set_time( p_md, f_length, &ex );
@@ -860,7 +860,7 @@ static void ControlHandler( Widget w, XtPointer closure, XEvent *event )
             i_playing = libvlc_playlist_isplaying( p_plugin->getVLC(), &ex );
             libvlc_exception_clear( &ex );
 
             i_playing = libvlc_playlist_isplaying( p_plugin->getVLC(), &ex );
             libvlc_exception_clear( &ex );
 
-            if( i_playing == 1 )
+            if( (i_playing == 1) && p_md )
             {
                 libvlc_exception_init( &ex );
                 libvlc_set_fullscreen( p_md, 1, &ex );
             {
                 libvlc_exception_init( &ex );
                 libvlc_set_fullscreen( p_md, 1, &ex );
@@ -875,7 +875,8 @@ static void ControlHandler( Widget w, XtPointer closure, XEvent *event )
             libvlc_audio_toggle_mute( p_plugin->getVLC(), &ex );
             libvlc_exception_clear( &ex );
         }
             libvlc_audio_toggle_mute( p_plugin->getVLC(), &ex );
             libvlc_exception_clear( &ex );
         }
-        libvlc_media_instance_release( p_md );
+        
+        if( p_md ) libvlc_media_instance_release( p_md );
     }
     Redraw( w, closure, event );
 }
     }
     Redraw( w, closure, event );
 }