3 files changed, 11 insertions, 4 deletions
diff --git a/src/plugins/Input/cue/cueparser.cpp b/src/plugins/Input/cue/cueparser.cpp
index 68d3cb9e2..1c4df54e5 100644
--- a/src/plugins/Input/cue/cueparser.cpp
+++ b/src/plugins/Input/cue/cueparser.cpp
@@ -51,8 +51,7 @@ CUEParser::CUEParser(const QString &fileName)
 
         if (words[0] == "FILE")
         {
-            m_filePath = QUrl(fileName).path ();
-            m_filePath = QFileInfo(m_filePath).dir().filePath(words[1]);
+            m_filePath = QFileInfo(fileName).dir().filePath(words[1]);
         }
         else if (words[0] == "PERFORMER")
         {
@@ -74,7 +73,10 @@ CUEParser::CUEParser(const QString &fileName)
         }
         else if (words[0] == "TRACK")
         {
-            FileInfo info("cue://" + fileName + QString("#%1").arg(words[1].toInt()));
+            QString path = fileName;
+            path.replace("%", QString(QUrl::toPercentEncoding("%")));
+            path.replace("#", QString(QUrl::toPercentEncoding("#")));
+            FileInfo info("cue://" + path + QString("#%1").arg(words[1].toInt()));
             info.setMetaData(Qmmp::TRACK, words[1].toInt());
             m_infoList << info;
             m_offsets << 0;
diff --git a/src/plugins/Input/cue/cueparser.h b/src/plugins/Input/cue/cueparser.h
index 654b9212d..28810c786 100644
--- a/src/plugins/Input/cue/cueparser.h
+++ b/src/plugins/Input/cue/cueparser.h
@@ -24,6 +24,7 @@
 #include <QMap>
 #include <QString>
 #include <QStringList>
+#include <QUrl>
 
 #include <qmmp/fileinfo.h>
 
diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp
index 0eff91e54..1a13d9049 100644
--- a/src/plugins/Input/cue/decoder_cue.cpp
+++ b/src/plugins/Input/cue/decoder_cue.cpp
@@ -51,7 +51,11 @@ DecoderCUE::~DecoderCUE()
 bool DecoderCUE::initialize()
 {
     m_input2 = 0;
-    CUEParser parser(QUrl(path).path());
+
+    QString p = QUrl(path).path();
+    p.replace(QString(QUrl::toPercentEncoding("#")), "#");
+    p.replace(QString(QUrl::toPercentEncoding("%")), "%");
+    CUEParser parser(p);
     if (parser.count() == 0)
     {
         qWarning("DecoderCUE: invalid cue file");