From 4a964b563ca166002ba6cf5b4e20ab29cd8cfff3 Mon Sep 17 00:00:00 2001 From: Jon Bergli Heier Date: Wed, 18 Aug 2010 00:23:54 +0200 Subject: Handle relative paths in get_raw as well. --- commands.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/commands.c b/commands.c index a02fd72..dd32a7c 100644 --- a/commands.c +++ b/commands.c @@ -91,7 +91,11 @@ static void commands_get_raw(GSocketConnection *connection, const gchar *cmd) { } GOutputStream *os = g_io_stream_get_output_stream((GIOStream*)connection); - GFile *file = g_file_new_for_path(path); + + gchar *full_path = music_get_full_path(path); + GFile *file = g_file_new_for_path(full_path); + g_free(full_path); + GFileInputStream *is = g_file_read(file, NULL, &error); if(is == NULL) { @@ -164,12 +168,14 @@ static void commands_get_mp3(GSocketConnection *connection, const gchar *cmd) { goto commands_get_mp3_free_path; } - gchar *full_path = music_get_full_path(path); GOutputStream *os = g_io_stream_get_output_stream((GIOStream*)connection); + + gchar *full_path = music_get_full_path(path); GFile *file = g_file_new_for_path(full_path); - GFileInputStream *is = g_file_read(file, NULL, &error); g_free(full_path); + GFileInputStream *is = g_file_read(file, NULL, &error); + if(is == NULL) { g_warning(error->message); g_error_free(error); -- cgit v1.2.3