smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +01:00
Code Issues Projects Releases Wiki Activity

move point of deletion of video timeline

Browse source 
The "ask about deletion" dialog will run a recursive main loop
which will call idle handlers, which could call the visual change
handler if the playhead is rolling. VTL is assumed to stoll
exist when this is called
This commit is contained in:
Paul Davis 2021-12-15 15:52:15 -07:00
parent 40c1a7016a
commit 7ade2099ce
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gtk2_ardour/ardour_ui.cc
View file

@ -1066,10 +1066,6 @@ If you still wish to quit, please use the\n\n\
fps_connection.disconnect();
}
delete ARDOUR_UI::instance()->video_timeline;
ARDOUR_UI::instance()->video_timeline = NULL;
stop_video_server();
/* Save state before deleting the session, as that causes some
windows to be destroyed before their visible state can be
saved.
@ -1084,8 +1080,15 @@ If you still wish to quit, please use the\n\n\
if (_session) {
if (delete_unnamed_session) {
/* This may run a recursive dialog, which will allow
* for the GTK idle handler to do things. Not a problem
* in itself, but something to keep in mind since it
* isn't visually apparent that this will allow a
* recursive main loop to execute.
*/
ask_about_scratch_deletion ();
}
@ -1095,6 +1098,10 @@ If you still wish to quit, please use the\n\n\
}
delete ARDOUR_UI::instance()->video_timeline;
ARDOUR_UI::instance()->video_timeline = NULL;
stop_video_server();
halt_connection.disconnect ();
AudioEngine::instance()->stop ();
quit ();