ncmpc version 0.19

[ncmpc.git] / src / lyrics.c

diff --git a/src/lyrics.c b/src/lyrics.c
index dc73f81c3dbd981ddf9a34f0bced0c6f69ff636d..ae17a8fb9d18c0f1bd2a8dee7e463cea62d1c3ad 100644 (file)
--- a/src/lyrics.c
+++ b/src/lyrics.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
  
  * This program is free software; you can redistribute it and/or modify
@@ -18,20 +18,22 @@
 */
 
 #include "lyrics.h"
-#include "../config.h"
+#include "config.h"
 
 #include <assert.h>
 
-static struct plugin_list plugins;
+static struct plugin_list empty, plugins;
 
 void lyrics_init(void)
 {
+       plugin_list_init(&empty);
        plugin_list_init(&plugins);
        plugin_list_load_directory(&plugins, LYRICS_PLUGIN_DIR);
 }
 
 void lyrics_deinit(void)
 {
+       plugin_list_deinit(&empty);
        plugin_list_deinit(&plugins);
 }
 
@@ -41,8 +43,8 @@ lyrics_load(const char *artist, const char *title,
 {
        const char *args[3] = { artist, title, NULL };
 
-       assert(artist != NULL);
-       assert(title != NULL);
+       if (artist == NULL || title == NULL)
+               return plugin_run(&empty, args, callback, data);
 
        return plugin_run(&plugins, args, callback, data);
 }