mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-08 23:26:40 +02:00
Code Issues Releases Wiki Activity

* Extra safety for QJson 0.8.0.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-11-28 04:59:23 +01:00
parent 13738239a9
commit 3ecbab3c63
1 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.cpp
View File

@@ -53,10 +53,13 @@ DatabaseCommand_LoadPlaylistEntries::generateEntries( DatabaseImpl* dbi )
QJson::Parser parser; bool ok;
if ( query_entries.next() )
{
if ( !query_entries.value( 0 ).isNull() )
{
// entries should be a list of strings:
QVariant v = parser.parse( query_entries.value( 0 ).toByteArray(), &ok );
Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
m_guids = v.toStringList();
QString inclause = QString( "('%1')" ).arg( m_guids.join( "', '" ) );
@@ -90,6 +93,7 @@ DatabaseCommand_LoadPlaylistEntries::generateEntries( DatabaseImpl* dbi )
m_entrymap.insert( e->guid(), e );
}
}
prevrev = query_entries.value( 4 ).toString();
}
@@ -116,9 +120,12 @@ DatabaseCommand_LoadPlaylistEntries::generateEntries( DatabaseImpl* dbi )
Q_ASSERT( false );
}
if ( !query_entries_old.value( 0 ).isNull() )
{
QVariant v = parser.parse( query_entries_old.value( 0 ).toByteArray(), &ok );
Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
m_oldentries = v.toStringList();
}
m_islatest = query_entries_old.value( 1 ).toBool();
}