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

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

diff --git a/cinelerra-5.1/cinelerra/assetedit.C b/cinelerra-5.1/cinelerra/assetedit.C
index 92e70a2ae611128a5e81e70738cc1026e9775deb..dbdabf36edb49a00bdea9cdc145d288135e4d606 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetedit.C
+++ b/cinelerra-5.1/cinelerra/assetedit.C
@@ -154,7 +154,7 @@ void AssetEdit::handle_close_event(int result)
 // happening when new_asset was created but not be happening anymore.
                        if(asset)
                        {
-                       mwindow->remove_asset_from_caches(asset);
+                               mwindow->remove_asset_from_caches(asset);
 //printf("AssetEdit::handle_close_event %d %f\n", __LINE__, asset->get_frame_rate());
                                asset->copy_from(changed_params, 0);
 //printf("AssetEdit::handle_close_event %d %d %d\n", __LINE__, changed_params->bits, asset->bits);
@@ -1036,8 +1036,8 @@ void DetailAssetThread::stop()
                dwindow->lock_window("DetailAssetThread::stop");
                dwindow->set_done(1);
                dwindow->unlock_window();
-               Thread::join();
        }
+       Thread::join();
 }
 
 void DetailAssetWindow::create_objects()