ffmpeg index marker fix, layout fixes, quit deadlock fix

[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..9d878072aca702bd3621865c1587ed1f48ec4a6b 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);
@@ -227,7 +227,7 @@ AssetEditWindow::AssetEditWindow(MWindow *mwindow, AssetEdit *asset_edit)
        mwindow->gui->get_abs_cursor_y(1) - (128 + 64 +
                (!asset_edit->indexable->have_audio() ? 0 : 180) +
                (!asset_edit->indexable->have_video() ? 0 : 350)) / 2,
-       400, (128 + 64 +
+       450, (128 + 64 +
                (!asset_edit->indexable->have_audio() ? 0 : 180) +
                (!asset_edit->indexable->have_video() ? 0 : 350)), 0, 0, 1)
 {
@@ -259,7 +259,7 @@ AssetEditWindow::~AssetEditWindow()
 
 void AssetEditWindow::create_objects()
 {
-       int y = 10, x = 10, x1 = 10, x2 = 160;
+       int y = 10, x = 10, x1 = 10, x2 = 190;
        char string[BCTEXTLEN];
        int vmargin;
        FileSystem fs;
@@ -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()