diff options
author | David Robillard <d@drobilla.net> | 2008-02-02 17:22:04 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-02-02 17:22:04 +0000 |
commit | 80c3677c837cc9eb432df3d65a34aba543fa7258 (patch) | |
tree | ca23bb7e5bff6c35c151d73221002a9ce3abfe1a /gtk2_ardour/ardour_dialog.cc | |
parent | 9f63ab9931e6478472853bdda58da47ea29ac125 (diff) |
Merge with 2.0-ongoing R2988
git-svn-id: svn://localhost/ardour2/branches/3.0@2991 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_dialog.cc')
-rw-r--r-- | gtk2_ardour/ardour_dialog.cc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc index 795b924075..bc24389948 100644 --- a/gtk2_ardour/ardour_dialog.cc +++ b/gtk2_ardour/ardour_dialog.cc @@ -24,7 +24,7 @@ #include "ardour_dialog.h" #include "keyboard.h" #include "ardour_ui.h" - +#include "splash.h" ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator) : Dialog (title, modal, use_seperator) @@ -66,3 +66,17 @@ ArdourDialog::on_unmap () { Dialog::on_unmap (); } + +void +ArdourDialog::on_show () +{ + // never allow the splash screen to obscure any dialog + + Splash* spl = Splash::instance(); + + if (spl) { + spl->pop_back (); + } + + Dialog::on_show (); +} |