]> git.sesse.net Git - vlc/commitdiff
Allowed user to cancel avi index creation.
authorLaurent Aimar <fenrir@videolan.org>
Mon, 18 Aug 2008 11:20:39 +0000 (13:20 +0200)
committerLaurent Aimar <fenrir@videolan.org>
Mon, 18 Aug 2008 17:37:50 +0000 (19:37 +0200)
modules/demux/avi/avi.c

index c6a27017a93ec29bf9156de2076cfebdcf0bcc5d..6579abd77d41e661bd57280628a707d1a5d69b9b 100644 (file)
@@ -2396,9 +2396,12 @@ static void AVI_IndexCreate( demux_t *p_demux )
         if( !vlc_object_alive (p_demux) )
             break;
 
-        /* Don't update dialog too often */
+        /* Don't update/check dialog too often */
         if( i_dialog_id > 0 && mdate() - i_dialog_update > 100000 )
         {
+            if( intf_ProgressIsCancelled( p_demux, i_dialog_id ) )
+                break;
+
             int64_t i_pos = stream_Tell( p_demux->s )* 100 /
                             stream_Size( p_demux->s );
             float f_pos = (float)i_pos;