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

[goodguy/history.git] / cinelerra-5.1 / guicast / vicon.C

diff --git a/cinelerra-5.1/guicast/vicon.C b/cinelerra-5.1/guicast/vicon.C
index 906fb6e938556377af762768e82dd8cd9428a823..deb3c57fd6370b1aa7af9b7d54ca4c88b8c01b9c 100644 (file)
--- a/cinelerra-5.1/guicast/vicon.C
+++ b/cinelerra-5.1/guicast/vicon.C
@@ -87,8 +87,8 @@ VIconThread::
        draw_lock->unlock();
        if( Thread::running() ) {
                Thread::cancel();
-               Thread::join();
        }
+       Thread::join();
        t_heap.remove_all_objects();
        delete timer;
        delete draw_lock;