From 8b59e50980c92df8cb65409bc735d247676d91a6 Mon Sep 17 00:00:00 2001 From: Nikolaus Gullotta Date: Mon, 9 Sep 2019 14:45:44 -0500 Subject: [PATCH] Quell more compiler warnings bool solo is now initialized properly and get_snapshot_by_name always returns a MixerSnapshot pointer --- libs/ardour/mixer_snapshot.cc | 1 + libs/ardour/mixer_snapshot_manager.cc | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/ardour/mixer_snapshot.cc b/libs/ardour/mixer_snapshot.cc index 30e04f749b..8fc8be48d0 100644 --- a/libs/ardour/mixer_snapshot.cc +++ b/libs/ardour/mixer_snapshot.cc @@ -416,6 +416,7 @@ void MixerSnapshot::recall() bool gain, mute, solo, recenable, select, route_active, monitoring; state.node.get_property(X_("used-to-share-gain"), gain); state.node.get_property(X_("mute"), mute); + state.node.get_property(X_("solo"), solo); state.node.get_property(X_("recenable"), recenable); state.node.get_property(X_("select"), select); state.node.get_property(X_("route-active"), route_active); diff --git a/libs/ardour/mixer_snapshot_manager.cc b/libs/ardour/mixer_snapshot_manager.cc index 98e15fb24c..9dbdba2e98 100644 --- a/libs/ardour/mixer_snapshot_manager.cc +++ b/libs/ardour/mixer_snapshot_manager.cc @@ -190,13 +190,16 @@ bool MixerSnapshotManager::demote(MixerSnapshot* snapshot) { MixerSnapshot* MixerSnapshotManager::get_snapshot_by_name(const string& name, bool global) { set snapshots_list = global ? _global_snapshots : _local_snapshots; + MixerSnapshot* snapshot; set::iterator it; for(it = snapshots_list.begin(); it != snapshots_list.end(); it++) { if((*it)->get_label() == name) { - return (*it); + snapshot = (*it); + break; } } + return snapshot; } void MixerSnapshotManager::create_snapshot(const string& label, const string& desc, RouteList& rl, bool global)