X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=e3271ccdbd456c8a65b8ecc8d4ac0f46457fb628;hb=219e9cae947fc9454f65c210d600800158d798fb;hp=1ab6ea1affe3b65c6a63ad6a95a9ba8592a0cdd3;hpb=7e5a0760f40ff787cc3d93cb7768a901ebe52809;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C index 1ab6ea1a..e3271ccd 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.C +++ b/cinelerra-5.1/cinelerra/awindowgui.C @@ -1699,8 +1699,12 @@ EDL *AWindowGUI::collect_proxy(Indexable *indexable) proxy_edl->session->audio_tracks = unproxy_asset->channels; proxy_edl->create_default_tracks(); double length = proxy_asset->frame_rate > 0 ? - (double)proxy_asset->video_length / proxy_asset->frame_rate : - 1.0 / mwindow->edl->session->frame_rate; + ( proxy_asset->video_length >= 0 ? + ( proxy_asset->video_length / proxy_asset->frame_rate ) : + ( proxy_edl->session->si_useduration ? + proxy_edl->session->si_duration : + 1.0 / proxy_asset->frame_rate ) ) : + 1.0 / proxy_edl->session->frame_rate; Track *current = proxy_edl->tracks->first; for( int vtrack=0; current; current=NEXT ) { if( current->data_type != TRACK_VIDEO ) continue;