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

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

diff --git a/cinelerra-5.1/cinelerra/androidcontrol.C b/cinelerra-5.1/cinelerra/androidcontrol.C
index 784dea2313a5732dc0e74953c037a22f729552a7..79008ac8a83f84c1be9d67776fcf78ba99a10329 100644 (file)
--- a/cinelerra-5.1/cinelerra/androidcontrol.C
+++ b/cinelerra-5.1/cinelerra/androidcontrol.C
@@ -143,7 +143,7 @@ AndroidControl::~AndroidControl()
        if( Thread::running() ) {
                done = 1;
                Thread::cancel();
-               Thread::join();
        }
+       Thread::join();
 }