fixed lyrics plugin

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1670 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 5 insertions, 4 deletions

diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp
index 9dac146c2..aa19cbfbe 100644
--- a/src/plugins/General/lyrics/lyricswindow.cpp
+++ b/src/plugins/General/lyrics/lyricswindow.cpp
@@ -64,12 +64,13 @@ void LyricsWindow::showText(QNetworkReply *reply)
     if (reply->error() != QNetworkReply::NoError)
     {
         ui.stateLabel->setText(tr("Error"));
-        ui.textEdit->setText(reply->errorString());
+        ui.textBrowser->setText(reply->errorString());
         return;
     }
     QString content = QString::fromUtf8(reply->readAll().constData());
 
-    QRegExp artist_regexp("<div id=\\\"artist\\\">([^<]*)</div>");
+    QRegExp artist_regexp("<div id=\\\"artist\\\">(.*)</div>");
+    artist_regexp.setMinimal(true);
     QRegExp title_regexp("<div id=\\\"title\\\">([^<]*)</div>");
     QRegExp lyrics_regexp("<div id=\\\"lyrics\\\">([^<]*)</div>");
     artist_regexp.indexIn(content);
@@ -81,11 +82,11 @@ void LyricsWindow::showText(QNetworkReply *reply)
     QString lyrics = lyrics_regexp.cap(1);
     lyrics.replace("[br /]", "<br />");
     if(lyrics.trimmed().isEmpty())
-        ui.textEdit->setHtml("<b>" + tr("Not found") + "</b>");
+        ui.textBrowser->setHtml("<b>" + tr("Not found") + "</b>");
     else
     {
         text += lyrics;
-        ui.textEdit->setHtml(text);
+        ui.textBrowser->setHtml(text);
     }
     reply->deleteLater();
 }