X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftimebar.C;h=68f42b5a13eaf47fb5f71b0f04111b458b0f0768;hb=83b70dd60863377cb281e6be5206304e10373e30;hp=7dfc7c01e62242886496d644e66b8e17261681ec;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/timebar.C b/cinelerra-5.1/cinelerra/timebar.C
index 7dfc7c01..68f42b5a 100644
--- a/cinelerra-5.1/cinelerra/timebar.C
+++ b/cinelerra-5.1/cinelerra/timebar.C
@@ -746,7 +746,8 @@ int TimeBar::button_press_event()
 			stop_playback();
 
 // Select region between two labels
-			if( !is_vwindow() && get_double_click() ) {
+			if( !is_vwindow() && get_double_click() &&
+			    get_edl()->labels->first ) {
 				int x = get_relative_cursor_x();
 				double position = pixel_to_position(x);
 // Test labels
@@ -848,21 +849,21 @@ int TimeBar::button_release_event()
 //printf("TimeBar::button_release_event %d %d\n", __LINE__, current_operation);
 	int result = 0;
 	int need_redraw = 0;
-	switch( current_operation )
-	{
-		case TIMEBAR_DRAG:
-			mwindow->gui->get_focused_pane()->canvas->stop_dragscroll();
+	switch( current_operation ) {
+	case TIMEBAR_DRAG: {
+		mwindow->gui->get_focused_pane()->canvas->stop_dragscroll();
+		current_operation = TIMEBAR_NONE;
+		need_redraw = 1;
+		CWindowCanvas *canvas = mwindow->cwindow->gui->canvas;
+		canvas->draw_scope(canvas->refresh_frame, -1);
+		result = 1;
+		break; }
+	default:
+		if( current_operation != TIMEBAR_NONE ) {
 			current_operation = TIMEBAR_NONE;
-			need_redraw = 1;
 			result = 1;
-			break;
-
-		default:
-			if( current_operation != TIMEBAR_NONE ) {
-				current_operation = TIMEBAR_NONE;
-				result = 1;
-			}
-			break;
+		}
+		break;
 	}
 
 	if( (!cursor_above() && highlighted) || need_redraw ) {
@@ -918,16 +919,16 @@ int TimeBar::select_region(double position)
 	}
 
 // Que the CWindow
-	mwindow->cwindow->gui->lock_window("TimeBar::select_region");
+	unlock_window();
 	mwindow->cwindow->update(1, 0, 0);
-	mwindow->cwindow->gui->unlock_window();
-	mwindow->gui->lock_window("TimeBar::select_region");
+	mwindow->gui->lock_window("TimeBar::select_region 3");
 	mwindow->gui->hide_cursor(0);
 	mwindow->gui->draw_cursor(1);
 	mwindow->gui->flash_canvas(0);
 	mwindow->gui->activate_timeline();
 	mwindow->gui->zoombar->update();
 	mwindow->gui->unlock_window();
+	lock_window("TimeBar::select_region 4");
 	update_highlights();
 	return 0;
 }