ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

cont'd work & fix bug introduced in 03660573e 

not every code path using InterthreadProgressWindow unsets cancel
after creating the Window.
This commit is contained in:
Robin Gareus 2016-05-24 03:33:02 +02:00
parent 6605b52c17
commit cd5cd2f8f2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/interthread_progress_window.cc
View File

@ -50,7 +50,8 @@ InterthreadProgressWindow::InterthreadProgressWindow (ARDOUR::InterThreadInfo* i
set_default_size (200, 100);
show_all ();
hide ();
hide ();
_interthread_info->cancel = false; // override on_hide
Glib::signal_timeout().connect (sigc::mem_fun (*this, &InterthreadProgressWindow::update), 100);
}
@ -58,7 +59,8 @@ InterthreadProgressWindow::InterthreadProgressWindow (ARDOUR::InterThreadInfo* i
void
InterthreadProgressWindow::on_hide ()
{
if (!_interthread_info->done) {
if (_interthread_info && !_interthread_info->done) {
//catch user pressing 'esc' or WM close
_interthread_info->cancel = true;
}
}