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:
parent
6605b52c17
commit
cd5cd2f8f2
@ -50,7 +50,8 @@ InterthreadProgressWindow::InterthreadProgressWindow (ARDOUR::InterThreadInfo* i
|
|||||||
|
|
||||||
set_default_size (200, 100);
|
set_default_size (200, 100);
|
||||||
show_all ();
|
show_all ();
|
||||||
hide ();
|
hide ();
|
||||||
|
_interthread_info->cancel = false; // override on_hide
|
||||||
|
|
||||||
Glib::signal_timeout().connect (sigc::mem_fun (*this, &InterthreadProgressWindow::update), 100);
|
Glib::signal_timeout().connect (sigc::mem_fun (*this, &InterthreadProgressWindow::update), 100);
|
||||||
}
|
}
|
||||||
@ -58,7 +59,8 @@ InterthreadProgressWindow::InterthreadProgressWindow (ARDOUR::InterThreadInfo* i
|
|||||||
void
|
void
|
||||||
InterthreadProgressWindow::on_hide ()
|
InterthreadProgressWindow::on_hide ()
|
||||||
{
|
{
|
||||||
if (!_interthread_info->done) {
|
if (_interthread_info && !_interthread_info->done) {
|
||||||
|
//catch user pressing 'esc' or WM close
|
||||||
_interthread_info->cancel = true;
|
_interthread_info->cancel = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user