reorder members and constructors to ensure null pointers for ARDOUR_UI::{editor,mixer}

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 9b6fc176a09181959e439f5e8be13648e8671e2b..b3298be777ee5e2b3bcf3f0b3b47ed4f9740a6b8 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -166,14 +166,15 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 
        , primary_clock (new MainClock (X_("primary"), false, X_("transport"), true, true, true, false, true))
        , secondary_clock (new MainClock (X_("secondary"), false, X_("secondary"), true, true, false, false, true))
-
+         
          /* big clock */
 
        , big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false))
        , video_timeline(0)
 
          /* start of private members */
-
+       , editor (0)
+       , mixer (0)
        , nsm (0)
        , _was_dirty (false)
        , _mixer_on_top (false)

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index f2cc1dde7909721f92d9e24bd9c82caba930db31..b4436aced8275ede8135cc4f9e2e68858f8e74c2 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -332,6 +332,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void toggle_session_options_window ();
 
   private:
+       PublicEditor*        editor;
+       Mixer_UI*            mixer;
        Gtk::Tooltips       _tooltips;
        NSM_Client*          nsm;
        bool                _was_dirty;
@@ -621,10 +623,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void rename_session ();
        void setup_order_hint ();
 
-       Mixer_UI   *mixer;
        int         create_mixer ();
-
-       PublicEditor     *editor;
        int         create_editor ();
 
        Meterbridge  *meterbridge;