From c07ed4b8489ea279400fba4891be54b663fd8885 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Wed, 25 May 2011 10:17:16 +0000
Subject: [PATCH] Fix a couple of uninitialised variables (should fix #4059).

git-svn-id: svn://localhost/ardour2/branches/3.0@9582 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/ardour_ui.cc | 3 +++
 gtk2_ardour/editor.cc    | 1 -
 gtk2_ardour/editor.h     | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 088bff7822..d53e441fd2 100644
--- 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 8a6e78d9aa..a0dc2ffb09 100644
--- 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 140235e890..6a0a59e0fb 100644
--- 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 ();