Commit ef86333e authored by Scott Wheeler's avatar Scott Wheeler

Reverting jriddel's commit -- this wasn't a typo...

svn path=/trunk/kdemultimedia/juk/; revision=287210
parent 94d4f902
......@@ -50,15 +50,15 @@ Tag *Tag::createTag(const QString &fileName, bool ignoreCache)
if(MediaFiles::isMP3(fileName)) {
TagLib::MPEG::File file(QFile::encodeName(fileName).data());
/* if(!file.isValid())
return 0;*/
if(!file.isValid())
return 0;
return new Tag(fileName, &file);
}
if(MediaFiles::isOgg(fileName)) {
TagLib::Vorbis::File file(QFile::encodeName(fileName).data());
/* if(!file.isValid())
return 0;*/
if(!file.isValid())
return 0;
return new Tag(fileName, &file);
}
......@@ -105,7 +105,7 @@ void Tag::save()
else if(MediaFiles::isFLAC(m_fileName))
file = new TagLib::FLAC::File(QFile::encodeName(m_fileName).data());
#endif
if(file /*&& file->isValid()*/ && file->tag()) {
if(file && file->isValid() && file->tag()) {
file->tag()->setTitle(QStringToTString(m_title));
file->tag()->setArtist(QStringToTString(m_artist));
file->tag()->setAlbum(QStringToTString(m_album));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment