Fix a couple of uninitialised variables (should fix #4059).

git-svn-id: svn://localhost/ardour2/branches/3.0@9582 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 088bff78222a219f5b7ce6cd8003f9dc477d2312..d53e441fd27b402d12692e637b92b1e3a3010193 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -204,6 +204,8 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        ui_config = new UIConfiguration();
        theme_manager = new ThemeManager();
 
+       key_editor = 0;
+
        editor = 0;
        mixer = 0;
        editor = 0;
@@ -217,6 +219,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        _will_create_new_session_automatically = false;
        add_route_dialog = 0;
        route_params = 0;
+       bundle_manager = 0;
        rc_option_editor = 0;
        session_option_editor = 0;
        location_ui = 0;

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 8a6e78d9aafc48c8e4c8bffd81920688aa9b1b68..a0dc2ffb09181edcf605952070914ced34bbfa04 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -364,7 +364,6 @@ Editor::Editor ()
        select_new_marker = false;
        rhythm_ferret = 0;
        layering_order_editor = 0;
-       _bundle_manager = 0;
        no_save_visual = false;
        resize_idle_id = -1;
 

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 140235e890b9254474188ee3891c06dae1022080..6a0a59e0fb02fc7181690e4d05bace318bac6b1c 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1980,7 +1980,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void timecode_snap_to_internal (framepos_t& first, int32_t direction = 0, bool for_mark = false);
 
        RhythmFerret* rhythm_ferret;
-       BundleManager* _bundle_manager;
 
        void fit_tracks (TrackViewList &);
        void fit_selected_tracks ();