Merge branch 'v0.18.x'

2014-07-11 21:33:50 +02:00
parent 681643ea9e ecb67a1ed1
commit 828cd6fd0b
12 changed files with 148 additions and 33 deletions
--- a/src/command/DatabaseCommands.cxx
+++ b/src/command/DatabaseCommands.cxx
@@ -32,6 +32,7 @@
 #include "util/Error.hxx"
 #include "SongFilter.hxx"
 #include "protocol/Result.hxx"
+#include "BulkEdit.hxx"

 #include <string.h>

@@ -106,6 +107,8 @@ handle_match_add(Client &client, unsigned argc, char *argv[], bool fold_case)
 		return CommandResult::ERROR;
 	}

+	const ScopeBulkEdit bulk_edit(client.partition);
+
 	const DatabaseSelection selection("", true, &filter);
 	Error error;
 	return AddFromDatabase(client.partition, selection, error)