X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fassetedit.C;h=3eee273f20ea946e090df7228b71958e4d522b66;hb=673257cc109af5234e4219a6baef9589b83b9359;hp=267597482af0b23a77530453a80e99027d5207fd;hpb=77815ec03df6a03ed75433e8cf8ae1e83fb76d6e;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/assetedit.C b/cinelerra-5.1/cinelerra/assetedit.C index 26759748..3eee273f 100644 --- a/cinelerra-5.1/cinelerra/assetedit.C +++ b/cinelerra-5.1/cinelerra/assetedit.C @@ -110,7 +110,7 @@ void AssetEdit::edit_asset(Indexable *indexable) void AssetEdit::handle_done_event(int result) { - if( !result ) { + if( !result && window->tc_hours_textbox ) { changed_params->tcstart = ceil(indexable->get_frame_rate() * (atoi(window->tc_hours_textbox->get_text()) * 3600 + atoi(window->tc_minutes_textbox->get_text()) * 60 + @@ -128,7 +128,7 @@ void AssetEdit::handle_close_event(int result) if(indexable->is_asset) { asset = (Asset*)indexable; - if( changed_params->equivalent(*asset, 1, 1, mwindow->edl) ) + if( !changed_params->equivalent(*asset, 1, 1, mwindow->edl) ) changed = 1; } else { @@ -177,6 +177,7 @@ void AssetEdit::handle_close_event(int result) } mwindow->gui->unlock_window(); //printf("AssetEdit::handle_close_event %d\n", __LINE__); + mwindow->awindow->gui->update_picon(indexable); mwindow->awindow->gui->async_update_assets(); mwindow->restart_brender(); @@ -224,6 +225,12 @@ AssetEditWindow::AssetEditWindow(MWindow *mwindow, AssetEdit *asset_edit) lohi = 0; allow_edits = 0; detail_thread = 0; + tc_hours_textbox = 0; + tc_minutes_textbox = 0; + tc_seconds_textbox = 0; + tc_rest_textbox = 0; + win_width = 0; + win_height = 0; }