summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_mixer.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-07-22 17:49:41 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-02-22 15:31:22 -0500
commit16731d07d33e49564b01640d12f09431bb96484e (patch)
tree319576cfec0e268535f965c1c5730f02fc0a9ad8 /gtk2_ardour/editor_mixer.cc
parent308f6ed8281d2b8913207e0236bd22678e73ec9b (diff)
remove use of current_toplevel() where unnecessary, fix broken necessary cases, generally fix up show/hide/attach/detach for Tabbables
Diffstat (limited to 'gtk2_ardour/editor_mixer.cc')
-rw-r--r--gtk2_ardour/editor_mixer.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 0651d30c1e..d1d5ad9cf4 100644
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -78,11 +78,16 @@ Editor::show_editor_mixer (bool yn)
show_editor_mixer_when_tracks_arrive = false;
if (yn) {
- Glib::RefPtr<Gdk::Window> win = current_toplevel()->get_window ();
+ Gtk::Window* toplevel = current_toplevel();
+ Glib::RefPtr<Gdk::Window> win;
Glib::RefPtr<Gdk::Screen> screen;
+ if (toplevel) {
+ win = toplevel->get_window();
+ }
+
if (win) {
- screen = win->get_screen();
+ screen = win->get_screen();
} else {
screen = Gdk::Screen::get_default();
}