dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when loading CD playlists

Browse Source
This commit is contained in:
Jonas Kvinge
2018-03-04 20:13:05 +01:00
parent fda970a5dc
commit 887e045a63
8 changed files with 20 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/song.cpp
View File

@@ -530,14 +530,12 @@ void Song::InitFromQuery(const SqlRow &q, bool reliable_metadata, int col) {
//qLog(Debug) << __PRETTY_FUNCTION__;
//qLog(Debug) << "Song::kColumns.size():" << Song::kColumns.size() << "q.columns_.size():" << q.columns_.size() << "col:" << col;
int i = 0;
int x = col;
d->id_ = toint(col);
for (i = 0 ; i < Song::kColumns.size(); i++) {
x=i+col+1;
for (int i = 0 ; i < Song::kColumns.size(); i++) {
x++;
if (x >= q.columns_.size()) {
qLog(Error) << "Skipping" << Song::kColumns.value(i);
break;
@@ -662,7 +660,7 @@ void Song::InitFromQuery(const SqlRow &q, bool reliable_metadata, int col) {
}
else if (Song::kColumns.value(i) == "cue_path") {
d->cue_path_ = tostr(col + x);
d->cue_path_ = tostr(x);
}
else {

3
src/core/song.h
View File

@@ -112,8 +112,7 @@ class Song {
void InitFromProtobuf(const pb::tagreader::SongMetadata &pb);
void InitFromQuery(const SqlRow &query, bool reliable_metadata, int col = 0);
void InitFromFilePartial(const QString &filename); // Just store the filename: incomplete but fast
void InitArtManual(); // Check if there is already a art in the cache and
// store the filename in art_manual
void InitArtManual(); // Check if there is already a art in the cache and store the filename in art_manual
#ifdef HAVE_LIBLASTFM
void InitFromLastFM(const lastfm::Track &track);
#endif