Commit 0475d89aa1c831be8429becf87add00d9545eea1

don't crash in corner cases where we don't have a collection yet on startup

BUG: 229050
src/context/engines/current/CurrentEngine.cpp
(16 / 13)
  
158158 setData( "albums", "headerText", QVariant( i18n( "Recently added albums" ) ) );
159159
160160 Amarok::Collection *coll = CollectionManager::instance()->primaryCollection();
161 if( m_qm )
162 m_qm->reset();
163 else
164 m_qm = coll->queryMaker();
165 m_qm->setQueryType( QueryMaker::Album );
166 m_qm->excludeFilter( Meta::valAlbum, QString(), true, true );
167 m_qm->orderBy( Meta::valCreateDate, true );
168 m_qm->limitMaxResultSize( 5 );
169 m_albums.clear();
161 if( coll )
162 {
163 if( m_qm )
164 m_qm->reset();
165 else
166 m_qm = coll->queryMaker();
167 m_qm->setQueryType( QueryMaker::Album );
168 m_qm->excludeFilter( Meta::valAlbum, QString(), true, true );
169 m_qm->orderBy( Meta::valCreateDate, true );
170 m_qm->limitMaxResultSize( 5 );
171 m_albums.clear();
170172
171 connect( m_qm, SIGNAL( newResultReady( QString, Meta::AlbumList ) ),
172 SLOT( resultReady( QString, Meta::AlbumList ) ), Qt::QueuedConnection );
173 connect( m_qm, SIGNAL( queryDone() ), SLOT( setupAlbumsData() ) );
173 connect( m_qm, SIGNAL( newResultReady( QString, Meta::AlbumList ) ),
174 SLOT( resultReady( QString, Meta::AlbumList ) ), Qt::QueuedConnection );
175 connect( m_qm, SIGNAL( queryDone() ), SLOT( setupAlbumsData() ) );
174176
175 m_qm->run();
177 m_qm->run();
178 }
176179 }
177180
178181 // Get the latest tracks played: