Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3070 from beedaddy/master

Browse Source 
Make sure that we feed set_url() with a QUrl from an UTF-8 encoded string
This commit is contained in:
hatstand 2013-12-12 06:46:24 -08:00
commit ab69c86ea6
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/song.cpp
View File

@ -485,7 +485,6 @@ void Song::InitFromQuery(const SqlRow& q, bool reliable_metadata, int col) {
d->init_from_file_ = reliable_metadata; d->init_from_file_ = reliable_metadata;
#define tostr(n) (q.value(n).isNull() ? QString::null : q.value(n).toString()) #define tostr(n) (q.value(n).isNull() ? QString::null : q.value(n).toString())
#define tobytearray(n)(q.value(n).isNull() ? QByteArray() : q.value(n).toByteArray())
#define toint(n) (q.value(n).isNull() ? -1 : q.value(n).toInt()) #define toint(n) (q.value(n).isNull() ? -1 : q.value(n).toInt())
#define tolonglong(n) (q.value(n).isNull() ? -1 : q.value(n).toLongLong()) #define tolonglong(n) (q.value(n).isNull() ? -1 : q.value(n).toLongLong())
#define tofloat(n) (q.value(n).isNull() ? -1 : q.value(n).toDouble()) #define tofloat(n) (q.value(n).isNull() ? -1 : q.value(n).toDouble())
@ -508,7 +507,7 @@ void Song::InitFromQuery(const SqlRow& q, bool reliable_metadata, int col) {
d->samplerate_ = toint(col + 14); d->samplerate_ = toint(col + 14);
d->directory_id_ = toint(col + 15); d->directory_id_ = toint(col + 15);
set_url(QUrl::fromEncoded(tobytearray(col + 16))); set_url(QUrl::fromEncoded(tostr(col + 16).toUtf8()));
d->basefilename_ = QFileInfo(d->url_.toLocalFile()).fileName(); d->basefilename_ = QFileInfo(d->url_.toLocalFile()).fileName();
d->mtime_ = toint(col + 17); d->mtime_ = toint(col + 17);
d->ctime_ = toint(col + 18); d->ctime_ = toint(col + 18);