Change PBD::PathScanner API to return results by value to avoid inadvertent memory leaks

1 files changed, 4 insertions, 6 deletions

diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index bae6a48837..7a9104cfdb 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -136,20 +136,20 @@ midi_map_filter (const string &str, void* /*arg*/)
 void
 GenericMidiControlProtocol::reload_maps ()
 {
-	vector<string *> *midi_maps;
+	vector<string> midi_maps;
 	PathScanner scanner;
 	Searchpath spath (system_midi_map_search_path());
 	spath += user_midi_map_directory ();
 
 	midi_maps = scanner (spath.to_string(), midi_map_filter, 0, false, true);
 
-	if (!midi_maps) {
+	if (midi_maps.empty()) {
 		cerr << "No MIDI maps found using " << spath.to_string() << endl;
 		return;
 	}
 
-	for (vector<string*>::iterator i = midi_maps->begin(); i != midi_maps->end(); ++i) {
-		string fullpath = *(*i);
+	for (vector<string>::iterator i = midi_maps.begin(); i != midi_maps.end(); ++i) {
+		string fullpath = *i;
 
 		XMLTree tree;
 
@@ -170,8 +170,6 @@ GenericMidiControlProtocol::reload_maps ()
 		
 		map_info.push_back (mi);
 	}
-
-	delete midi_maps;
 }
 	
 void