summaryrefslogtreecommitdiff
path: root/gtk2_ardour/playlist_selector.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2012-04-07 01:54:06 +0000
committerCarl Hetherington <carl@carlh.net>2012-04-07 01:54:06 +0000
commit3fa134e8aebf6c67142559f5e435eb4ca08d850b (patch)
tree1baea1c459d32d7a2c11de7467b4ad989ce7dde3 /gtk2_ardour/playlist_selector.cc
parent8d300dae852158ce10f4d1bb1caaab06444923e4 (diff)
Fix another out-of-scope variable access (#4811).
git-svn-id: svn://localhost/ardour2/branches/3.0@11809 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/playlist_selector.cc')
-rw-r--r--gtk2_ardour/playlist_selector.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc
index 9e7a64e3b3..31710deb71 100644
--- a/gtk2_ardour/playlist_selector.cc
+++ b/gtk2_ardour/playlist_selector.cc
@@ -189,7 +189,8 @@ PlaylistSelector::show_for (RouteUI* ruix)
_session->playlists->unassigned (unassigned);
TreeModel::Row row;
- TreeModel::Row* selected_row = 0;
+ TreeModel::Row selected_row;
+ bool have_selected = false;
TreePath this_path;
row = *(model->append (others.children()));
@@ -205,11 +206,12 @@ PlaylistSelector::show_for (RouteUI* ruix)
child_row[columns.playlist] = *p;
if (*p == this_track->playlist()) {
- selected_row = &child_row;
+ selected_row = child_row;
+ have_selected = true;
}
- if (selected_row != 0) {
- tree.get_selection()->select (*selected_row);
+ if (have_selected) {
+ tree.get_selection()->select (selected_row);
}
}