From: Good Guy Date: Thu, 25 Apr 2019 02:22:01 +0000 (-0600) Subject: fix draw_refresh opengl deadlock, cleanup last chkin X-Git-Tag: 2019-08~63 X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=82cd36a45514043812fc911a6f1b0b28ebe27e9c;p=goodguy%2Fcinelerra.git fix draw_refresh opengl deadlock, cleanup last chkin --- diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C index 383445ae..2491571d 100644 --- a/cinelerra-5.1/cinelerra/cwindowgui.C +++ b/cinelerra-5.1/cinelerra/cwindowgui.C @@ -1129,10 +1129,10 @@ void CWindowCanvas::draw_refresh(int flush) clear(0); if( mwindow->uses_opengl() ) { get_canvas()->unlock_window(); - mwindow->playback_3d->finish_output(); - get_canvas()->lock_window("CWindowCanvas::draw_refresh"); get_canvas()->flush(); get_canvas()->sync_display(); + mwindow->playback_3d->finish_output(); + get_canvas()->lock_window("CWindowCanvas::draw_refresh"); } if( refresh_frame && refresh_frame->get_w()>0 && refresh_frame->get_h()>0 ) { float in_x1, in_y1, in_x2, in_y2; diff --git a/cinelerra-5.1/plugins/tracer/.gdb_history b/cinelerra-5.1/plugins/tracer/.gdb_history deleted file mode 100644 index a1ff470a..00000000 --- a/cinelerra-5.1/plugins/tracer/.gdb_history +++ /dev/null @@ -1 +0,0 @@ -p 82*541/352