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

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

diff --git a/cinelerra-5.1/cinelerra/tracking.C b/cinelerra-5.1/cinelerra/tracking.C
index 5a4ef42e2e1094147466f66390a8a3675dc46cb5..b2094970369b2ff71f5915e6012506efcc8f0dcd 100644 (file)
--- a/cinelerra-5.1/cinelerra/tracking.C
+++ b/cinelerra-5.1/cinelerra/tracking.C
@@ -64,9 +64,8 @@ Tracking::~Tracking()
                state = DONE;
 // Not working in NPTL for some reason
 //             Thread::cancel();
-               Thread::join();
        }
-
+       Thread::join();
 
        delete startup_lock;
 }
@@ -106,7 +105,6 @@ int Tracking::stop_playback()
                update_tracker(position);
        
                stop_meters();
-               state = DONE;
        }
        return 0;
 }