info btn, zoom lockup, nesting, paste fixes

[goodguy/history.git] / cinelerra-5.1 / cinelerra / resourcethread.C

diff --git a/cinelerra-5.1/cinelerra/resourcethread.C b/cinelerra-5.1/cinelerra/resourcethread.C
index c14bf27b79ca0b7b36def8d5e1afc7aba6baf128..c3d69412ce65604194b7a6cbe63e47c001dfb9d2 100644 (file)
--- a/cinelerra-5.1/cinelerra/resourcethread.C
+++ b/cinelerra-5.1/cinelerra/resourcethread.C
@@ -338,8 +338,8 @@ void ResourceThread::stop()
                done = 1;
                interrupted = 1;
                draw_lock->unlock();
-               join();
        }
+       join();
 }
 
 
@@ -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)) )
        {