db/DatabaseLock: add class ScopeDatabaseUnlock

2015-12-15 23:24:34 +01:00
parent e31f0b8b0c
commit c11345c4d9
3 changed files with 22 additions and 11 deletions
@@ -36,15 +36,14 @@ DatabaseEditor::DeleteSong(Directory &dir, Song *del)
 	/* first, prevent traversers in main task from getting this */
 	dir.RemoveSong(del);

-	db_unlock(); /* temporary unlock, because update_remove_song() blocks */
+	/* temporary unlock, because update_remove_song() blocks */
+	const ScopeDatabaseUnlock unlock;

 	/* now take it out of the playlist (in the main_task) */
 	remove.Remove(del);

 	/* finally, all possible references gone, free it */
 	del->Free();
-
-	db_lock();
 }

 void