From 798c578f8e1ff40a0c39bd6302d8df80ab81b8fb Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sun, 2 Dec 2018 09:39:17 +0000
Subject: cdaudio: fixed regression

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8473 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Input/cdaudio/decodercdaudiofactory.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/plugins/Input/cdaudio/decodercdaudiofactory.cpp')

diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
index 2f030bcb8..9fca3c1fe 100644
--- a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
+++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include <QMessageBox>
-#include <QRegExp>
 #include <cdio/version.h>
 #include <cddb/version.h>
 #include "settingsdialog.h"
@@ -55,9 +54,12 @@ Decoder *DecoderCDAudioFactory::create(const QString &url, QIODevice *input)
 QList<TrackInfo *> DecoderCDAudioFactory::createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *)
 {
     QList<TrackInfo*> list;
+
+    if(path.contains("#"))
+        return list;
+
     QString device_path = path;
     device_path.remove("cdda://");
-    device_path.remove(QRegExp("#\\d+$"));
     QList <CDATrack> tracks = DecoderCDAudio::generateTrackList(device_path, parts);
     foreach(CDATrack t, tracks)
     {
-- 
cgit v1.2.3-13-gbd6f