ProxyDatabase: obey visitor return values

4e1eb032 · Max Kellermann · fcf0f829 · 4e1eb032
Commit 4e1eb032 authored Aug 15, 2012 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 6 deletions

ProxyDatabasePlugin.cxx src/db/ProxyDatabasePlugin.cxx +9 -6

No files found.
--- a/src/db/ProxyDatabasePlugin.cxx
+++ b/src/db/ProxyDatabasePlugin.cxx
@@ -323,20 +323,23 @@ Visit(struct mpd_connection *connection, struct directory &parent,
 			break;
 		case MPD_ENTITY_TYPE_DIRECTORY:
-			Visit(connection, parent, recursive,
+			if (!Visit(connection, parent, recursive,
 				   mpd_entity_get_directory(entity),
 				   visit_directory, visit_song, visit_playlist,
-			      error_r);
+				   error_r))
+				return false;
 			break;
 		case MPD_ENTITY_TYPE_SONG:
-			Visit(parent, mpd_entity_get_song(entity), visit_song,
+			if (!Visit(parent, mpd_entity_get_song(entity),
-			      error_r);
+				   visit_song, error_r))
+				return false;
 			break;
 		case MPD_ENTITY_TYPE_PLAYLIST:
-			Visit(parent, mpd_entity_get_playlist(entity),
+			if (!Visit(parent, mpd_entity_get_playlist(entity),
-			      visit_playlist, error_r);
+				   visit_playlist, error_r))
+				return false;
 			break;
 		}
 	}