X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_dialogs.cc;h=7d7ee7d60b0df2cf74b8e3f6016bba193134903e;hb=c912bd61ae49cc79158f3322439c29b27ef51de8;hp=d0bb8e6fe19a969c629cc836045945cb97dc9ec1;hpb=11c6aaec7a16de8a3fb0dd632da54ce1ba1bec38;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index d0bb8e6fe1..7d7ee7d60b 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -376,18 +376,10 @@ ARDOUR_UI::goto_mixer_window ()
 void
 ARDOUR_UI::toggle_mixer_window ()
 {
-	if (!editor || !mixer || !meterbridge) {
-		/* can this really happen?
-		 * keyboard shortcut during session close, maybe?
-		 */
-#ifndef NDEBUG
-		 /* one way to find out: */
-		printf("ARDOUR_UI::toggle_mixer_window: Editor: %p Mixer: %p MB: %p\n", editor, mixer, meterbridge);
-		PBD::stacktrace (std::cerr, 20);
-		assert (0);
-#endif
-		return;
-	}
+	/* thse windows are created in ARDOUR_UI::setup_windows()
+	 * it should be impossible to get here with any of them being NULL
+	 */
+	assert (editor && mixer && meterbridge);
 
 	bool show = false;
 	bool obscuring = false;
@@ -415,18 +407,7 @@ ARDOUR_UI::toggle_mixer_window ()
 void
 ARDOUR_UI::toggle_meterbridge ()
 {
-	if (!editor || !mixer || !meterbridge) {
-		/* can this really happen?
-		 * keyboard shortcut during session close, maybe?
-		 */
-#ifndef NDEBUG
-		 /* one way to find out: */
-		printf("ARDOUR_UI::toggle_mixer_window: Editor: %p Mixer: %p MB: %p\n", editor, mixer, meterbridge);
-		PBD::stacktrace (std::cerr, 20);
-		assert (0);
-#endif
-		return;
-	}
+	assert (editor && mixer && meterbridge);
 
 	bool show = false;
 	bool obscuring = false;