mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-03-20 07:49:42 +01:00
Don't create a new revision when resolvign is finished if we've been deleted meanwhile
This commit is contained in:
parent
2de19a1c94
commit
46a73566f5
@ -147,6 +147,7 @@ void
|
||||
Playlist::init()
|
||||
{
|
||||
m_busy = false;
|
||||
m_deleted = false;
|
||||
m_locallyChanged = false;
|
||||
connect( Pipeline::instance(), SIGNAL( idle() ), SLOT( onResolvingFinished() ) );
|
||||
}
|
||||
@ -248,6 +249,7 @@ void
|
||||
Playlist::reportDeleted( const Tomahawk::playlist_ptr& self )
|
||||
{
|
||||
Q_ASSERT( self.data() == this );
|
||||
m_deleted = true;
|
||||
m_source->collection()->deletePlaylist( self );
|
||||
|
||||
emit deleted( self );
|
||||
@ -480,7 +482,7 @@ Playlist::onResultsFound( const QList<Tomahawk::result_ptr>& results )
|
||||
void
|
||||
Playlist::onResolvingFinished()
|
||||
{
|
||||
if ( m_locallyChanged )
|
||||
if ( m_locallyChanged && !m_deleted )
|
||||
{
|
||||
m_locallyChanged = false;
|
||||
createNewRevision( currentrevision(), currentrevision(), m_entries );
|
||||
|
@ -295,6 +295,7 @@ private:
|
||||
QQueue<RevisionQueueItem> m_revisionQueue;
|
||||
|
||||
bool m_locallyChanged;
|
||||
bool m_deleted;
|
||||
bool m_busy;
|
||||
};
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user