projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ffb7cb2
)
and a more intrusive KDE workaround
5.5
author
Robin Gareus
<robin@gareus.org>
Wed, 30 Nov 2016 22:19:44 +0000
(23:19 +0100)
committer
Robin Gareus
<robin@gareus.org>
Wed, 30 Nov 2016 22:19:44 +0000
(23:19 +0100)
gtk2_ardour/engine_dialog.cc
patch
|
blob
|
history
diff --git
a/gtk2_ardour/engine_dialog.cc
b/gtk2_ardour/engine_dialog.cc
index 1bc6f4968b219853a0c65583806db052f844a102..a9b4dbdce04d868194747050546aaf4e14001f91 100644
(file)
--- a/
gtk2_ardour/engine_dialog.cc
+++ b/
gtk2_ardour/engine_dialog.cc
@@
-422,7
+422,7
@@
EngineControl::on_show ()
{
ArdourDialog::on_show ();
if (Splash::instance()) {
{
ArdourDialog::on_show ();
if (Splash::instance()) {
- Splash::instance()->
pop_back_for (*this
);
+ Splash::instance()->
hide (
);
}
if (!ARDOUR::AudioEngine::instance()->current_backend() || !ARDOUR::AudioEngine::instance()->running()) {
// re-check _have_control (jackd running) see #6041
}
if (!ARDOUR::AudioEngine::instance()->current_backend() || !ARDOUR::AudioEngine::instance()->running()) {
// re-check _have_control (jackd running) see #6041
@@
-2723,6
+2723,9
@@
EngineControl::start_stop_button_clicked ()
start_engine ();
if (!ARDOUR_UI::instance()->session_loaded) {
ArdourDialog::on_response (RESPONSE_OK);
start_engine ();
if (!ARDOUR_UI::instance()->session_loaded) {
ArdourDialog::on_response (RESPONSE_OK);
+ if (Splash::instance()) {
+ Splash::instance()->pop_front ();
+ }
}
}
}
}
}
}
@@
-3136,6
+3139,9
@@
EngineControl::connect_disconnect_click()
start_engine ();
if (!ARDOUR_UI::instance()->session_loaded) {
ArdourDialog::on_response (RESPONSE_OK);
start_engine ();
if (!ARDOUR_UI::instance()->session_loaded) {
ArdourDialog::on_response (RESPONSE_OK);
+ if (Splash::instance()) {
+ Splash::instance()->pop_front ();
+ }
}
}
}
}
}
}