Changeset fded58d9efdefbc1d3d3a245f312a8ca6cb225bb

Show
Ignore:
Timestamp:
03/04/08 22:10:00 (5 months ago)
Author:
Jean-Paul Saman <jpsaman@videolan.org>
git-committer:
Jean-Paul Saman <jpsaman@videolan.org> 1204665000 +0100
git-parent:

[c2f5a92b2b73bdc23c5d588af49c0f5a8b754b7c]

git-author:
Jean-Paul Saman <jpsaman@videolan.org> 1204664583 +0100
Message:

[PATCH] by Anthony Loiseau <anthony.loiseau at gmail dot com>: Avoid browser crashing on mozilla-plugin when jumping into the media using the time-slider and no movie is loaded.

Signed-off-by: Jean-Paul Saman <jpsaman@videolan.org>

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • projects/mozilla/vlcshell.cpp

    r35979e8 rfded58d  
    812812        if( i_yPos <= (i_height-30) ) 
    813813        { 
    814             vlc_int64_t f_length; 
    815             libvlc_exception_init( &ex ); 
    816             f_length = libvlc_media_instance_get_length( p_md, &ex ) / 100; 
    817             libvlc_exception_clear( &ex ); 
    818  
    819             f_length = (float)f_length * 
    820                     ( ((float)i_xPos-4 ) / ( ((float)i_width-8)/100) ); 
    821  
    822             libvlc_exception_init( &ex ); 
    823             libvlc_media_instance_set_time( p_md, f_length, &ex ); 
    824             libvlc_exception_clear( &ex ); 
     814            /* if a movie is loaded */ 
     815            if( p_md ) 
     816            { 
     817                vlc_int64_t f_length; 
     818                libvlc_exception_init( &ex ); 
     819                f_length = libvlc_media_instance_get_length( p_md, &ex ) / 100; 
     820                libvlc_exception_clear( &ex ); 
     821 
     822                f_length = (float)f_length * 
     823                        ( ((float)i_xPos-4 ) / ( ((float)i_width-8)/100) ); 
     824 
     825                libvlc_exception_init( &ex ); 
     826                libvlc_media_instance_set_time( p_md, f_length, &ex ); 
     827                libvlc_exception_clear( &ex ); 
     828            } 
    825829        } 
    826830