From: Andreas Obergrusberger Date: Wed, 3 Jan 2007 21:07:39 +0000 (+0000) Subject: fix error display on lyrics screen X-Git-Tag: v0.12_alpha1~348 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=653b7f9dd27d655cf1bdca6d559d3ece6cdb6443;p=ncmpc.git fix error display on lyrics screen git-svn-id: https://svn.musicpd.org/ncmpc/branches/tradiaz@5219 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- diff --git a/plugins/hd/lyrics_hd.c b/plugins/hd/lyrics_hd.c index a90ee9d..7a3a8b7 100644 --- a/plugins/hd/lyrics_hd.c +++ b/plugins/hd/lyrics_hd.c @@ -7,13 +7,13 @@ char *check_lyr_hd(char *artist, char *title, int how) { //checking whether for lyrics file existence and proper access - static char path[1024]; - snprintf(path, 1024, "%s/.lyrics/%s/%s.lyric", - getenv("HOME"), artist, title); + result |= 2; + static char path[1024]; + snprintf(path, 1024, "%s/.lyrics/%s/%s.lyric", + getenv("HOME"), artist, title); - if(g_access(path, how) != 0) return NULL; - - return path; + if(g_access(path, how) != 0) return NULL; + return path; } @@ -25,7 +25,7 @@ int get_lyr_hd(char *artist, char *title) FILE *lyr_file; lyr_file = fopen(path, "r"); if(lyr_file == NULL) return -1; - + result |= 4; char *buf = NULL; char **line = &buf; size_t n = 0; diff --git a/src/lyrics_hd.c b/src/lyrics_hd.c index 2d91adc..322160c 100644 --- a/src/lyrics_hd.c +++ b/src/lyrics_hd.c @@ -7,13 +7,13 @@ char *check_lyr_hd(char *artist, char *title, int how) { //checking whether for lyrics file existence and proper access - static char path[1024]; - snprintf(path, 1024, "%s/.lyrics/%s/%s.lyric", - getenv("HOME"), artist, title); + result |= 2; + static char path[1024]; + snprintf(path, 1024, "%s/.lyrics/%s/%s.lyric", + getenv("HOME"), artist, title); - if(g_access(path, how) != 0) return NULL; - - return path; + if(g_access(path, how) != 0) return NULL; + return path; } @@ -25,7 +25,7 @@ int get_lyr_hd(char *artist, char *title) FILE *lyr_file; lyr_file = fopen(path, "r"); if(lyr_file == NULL) return -1; - + result |= 4; char *buf = NULL; char **line = &buf; size_t n = 0;