change thread join strategy, fix a few leaks, fix a few bugs

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

diff --git a/cinelerra-5.1/cinelerra/channelinfo.C b/cinelerra-5.1/cinelerra/channelinfo.C
index 140f3d30e509848b7cb26d7045228b6f806a68fd..71469330cad7367b779e797064a7bbdc4c5df90f 100644 (file)
--- a/cinelerra-5.1/cinelerra/channelinfo.C
+++ b/cinelerra-5.1/cinelerra/channelinfo.C
@@ -70,8 +70,8 @@ void ChanSearch::stop()
                if( gui ) gui->set_done(1);
                window_lock->unlock();
                Thread::cancel();
-               Thread::join();
        }
+       Thread::join();
 }
 
 void ChanSearch::run()
@@ -560,8 +560,8 @@ void ChannelProgress::stop()
        if( Thread::running() ) {
                done = 1;
                Thread::cancel();
-               Thread::join();
        }
+       Thread::join();
 }
 
 void ChannelProgress::run()
@@ -1050,8 +1050,8 @@ void ChannelThread::stop()
        if( Thread::running() ) {
                done = 1;
                Thread::cancel();
-               Thread::join();
        }
+       Thread::join();
 }
 
 ChannelThread::ChannelThread(ChannelInfoGUI *gui)
@@ -1655,8 +1655,8 @@ void ChannelInfo::stop()
                if( gui ) gui->stop(1);
                window_lock->unlock();
                Thread::cancel();
-               Thread::join();
        }
+       Thread::join();
 }
 
 void ChannelInfo::run()