From 203e026e1249fa8139d6cd99c3894a6b7d743204 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 11 Jul 2012 20:35:45 +0000 Subject: fixed possible segmentation fault in cue plugin git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2786 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/cue/cueparser.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/plugins/Input/cue/cueparser.cpp') diff --git a/src/plugins/Input/cue/cueparser.cpp b/src/plugins/Input/cue/cueparser.cpp index 70b3ea887..581acf80b 100644 --- a/src/plugins/Input/cue/cueparser.cpp +++ b/src/plugins/Input/cue/cueparser.cpp @@ -50,10 +50,8 @@ CUEParser::CUEParser(const QString &url) QTextStream textStream (&file); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("CUE"); - QTextCodec *codec = QTextCodec::codecForName(settings.value("encoding","ISO-8859-1").toByteArray ()); - if(!codec) - codec = QTextCodec::codecForName("UTF-8"); m_dirty = settings.value("dirty_cue", false).toBool(); + QTextCodec *codec = 0; #ifdef WITH_ENCA EncaAnalyser analyser = 0; if(settings.value("use_enca", false).toBool()) @@ -74,6 +72,10 @@ CUEParser::CUEParser(const QString &url) } } #endif + if(!codec) + codec = QTextCodec::codecForName(settings.value("encoding","ISO-8859-1").toByteArray ()); + if(!codec) + codec = QTextCodec::codecForName("UTF-8"); settings.endGroup(); //qDebug("CUEParser: using %s encoding", codec->name().constData()); textStream.setCodec(codec); -- cgit v1.2.3-13-gbd6f