X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fresourcethread.C;h=c3d69412ce65604194b7a6cbe63e47c001dfb9d2;hb=155cea9e8f0f6a59f3e713230575603da305d47e;hp=6aa27b99e125ff9c5ff9399b057609174a42726a;hpb=0d49253b107e67067b6143958fee3f8e4c0e0b6c;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/resourcethread.C b/cinelerra-5.1/cinelerra/resourcethread.C index 6aa27b99..c3d69412 100644 --- a/cinelerra-5.1/cinelerra/resourcethread.C +++ b/cinelerra-5.1/cinelerra/resourcethread.C @@ -374,6 +374,8 @@ void ResourceThread::open_render_engine(EDL *nested_edl, File *ResourceThread::get_audio_source(Asset *asset) { + if( interrupted ) asset = 0; + if( audio_asset && audio_asset != asset && (!asset || strcmp(audio_asset->path, asset->path)) ) { @@ -394,6 +396,8 @@ File *ResourceThread::get_audio_source(Asset *asset) File *ResourceThread::get_video_source(Asset *asset) { + if( interrupted ) asset = 0; + if( video_asset && video_asset != asset && (!asset || strcmp(video_asset->path, asset->path)) ) {