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

Fixed TWK-1454: Don't crash when trying to set invalid current index.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-11-12 11:05:58 +01:00
parent 7cd0526d95
commit f2235cee55
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libtomahawk/AlbumPlaylistInterface.cpp
View File

@@ -1,6 +1,6 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> === /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
* *
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org> * Copyright 2010-2014, Christian Muehlhaeuser <muesli@tomahawk-player.org>
* Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org> * Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
* Copyright 2013, Teo Mrnjavac <teo@kde.org> * Copyright 2013, Teo Mrnjavac <teo@kde.org>
* *
@@ -61,9 +61,10 @@ AlbumPlaylistInterface::~AlbumPlaylistInterface()
void void
AlbumPlaylistInterface::setCurrentIndex( qint64 index ) AlbumPlaylistInterface::setCurrentIndex( qint64 index )
{ {
if ( index < m_queries.size() && !m_queries.at( index ).isNull() && m_queries.at( index )->results().size() > 0 ) { if ( index >= 0 && index < m_queries.size() &&
!m_queries.at( index ).isNull() && m_queries.at( index )->results().size() > 0 )
{
PlaylistInterface::setCurrentIndex( index ); PlaylistInterface::setCurrentIndex( index );
m_currentItem = m_queries.at( index )->results().first(); m_currentItem = m_queries.at( index )->results().first();
} }
} }

7
src/libtomahawk/ArtistPlaylistInterface.cpp
View File

@@ -1,6 +1,6 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> === /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
* *
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org> * Copyright 2010-2014, Christian Muehlhaeuser <muesli@tomahawk-player.org>
* Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org> * Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
* *
* Tomahawk is free software: you can redistribute it and/or modify * Tomahawk is free software: you can redistribute it and/or modify
@@ -52,11 +52,14 @@ ArtistPlaylistInterface::~ArtistPlaylistInterface()
void void
ArtistPlaylistInterface::setCurrentIndex( qint64 index ) ArtistPlaylistInterface::setCurrentIndex( qint64 index )
{
if ( index >= 0 && index < m_queries.size() &&
!m_queries.at( index ).isNull() && m_queries.at( index )->results().size() > 0 )
{ {
PlaylistInterface::setCurrentIndex( index ); PlaylistInterface::setCurrentIndex( index );
m_currentItem = m_queries.at( index )->results().first(); m_currentItem = m_queries.at( index )->results().first();
} }
}
qint64 qint64