diff options
| author | Max Kellermann <max@duempel.org> | 2013-08-10 18:02:44 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-09-04 18:14:22 +0200 |
| commit | 29030b54c98b0aee65fbc10ebf7ba36bed98c02c (patch) | |
| tree | 79766830b55ebca38ddbce84d8d548227eedb69e /src/PlaylistSave.cxx | |
| parent | c9fcc7f14860777458153eb2d13c773ccfa1daa2 (diff) | |
| download | mpd-29030b54c98b0aee65fbc10ebf7ba36bed98c02c.tar.gz mpd-29030b54c98b0aee65fbc10ebf7ba36bed98c02c.tar.xz mpd-29030b54c98b0aee65fbc10ebf7ba36bed98c02c.zip | |
util/Error: new error passing library
Replaces GLib's GError.
Diffstat (limited to 'src/PlaylistSave.cxx')
| -rw-r--r-- | src/PlaylistSave.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
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 <glib.h> @@ -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(); |