X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=inline;f=cinelerra-5.1%2Fcinelerra%2Fassetedit.C;h=dbdabf36edb49a00bdea9cdc145d288135e4d606;hb=3ec3a9cc6afc6561311686b3ec597ee3c1d80d6f;hp=92e70a2ae611128a5e81e70738cc1026e9775deb;hpb=50a589b1decdd353a984d8a710e064ebaf8b4f7b;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/assetedit.C b/cinelerra-5.1/cinelerra/assetedit.C index 92e70a2a..dbdabf36 100644 --- 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()