Prefer testing the session instead of using a global variable

[ardour.git] / gtk2_ardour / ardour_ui_dialogs.cc

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index db4b190e1260793d119d525199957c51fc7121da..7a8366517e6165ec7f2829b47eb7fdedb9c31849 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -61,6 +61,7 @@
 #include "midi_tracer.h"
 #include "mini_timeline.h"
 #include "mixer_ui.h"
+#include "plugin_dspload_window.h"
 #include "public_editor.h"
 #include "processor_box.h"
 #include "rc_option_editor.h"
@@ -128,6 +129,7 @@ ARDOUR_UI::set_session (Session *s)
        big_clock->set_session (s);
        video_timeline->set_session (s);
        lua_script_window->set_session (s);
+       plugin_dsp_load_window->set_session (s);
        transport_masters_window->set_session (s);
        rc_option_editor->set_session (s);
 
@@ -335,10 +337,9 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 
        blink_connection.disconnect ();
 
-       delete _session;
+       ARDOUR::Session* session_to_delete = _session;
        _session = 0;
-
-       session_loaded = false;
+       delete session_to_delete;
 
        update_title ();