From 29030b54c98b0aee65fbc10ebf7ba36bed98c02c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 10 Aug 2013 18:02:44 +0200 Subject: util/Error: new error passing library Replaces GLib's GError. --- src/PlaylistSave.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/PlaylistSave.cxx') diff --git a/src/PlaylistSave.cxx b/src/PlaylistSave.cxx index b259b1f3d..efcf03402 100644 --- a/src/PlaylistSave.cxx +++ b/src/PlaylistSave.cxx @@ -27,6 +27,7 @@ #include "fs/Path.hxx" #include "fs/FileSystem.hxx" #include "util/UriUtil.hxx" +#include "util/Error.hxx" #include @@ -99,14 +100,11 @@ bool playlist_load_spl(struct playlist *playlist, struct player_control *pc, const char *name_utf8, unsigned start_index, unsigned end_index, - GError **error_r) + Error &error) { - GError *error = NULL; - PlaylistFileContents contents = LoadPlaylistFile(name_utf8, &error); - if (contents.empty() && error != nullptr) { - g_propagate_error(error_r, error); + PlaylistFileContents contents = LoadPlaylistFile(name_utf8, error); + if (contents.empty() && error.IsDefined()) return false; - } if (end_index > contents.size()) end_index = contents.size(); -- cgit v1.2.3