Commit 8415db9788c6dbe96b9820885720f1509872ea41

fix crash when an mysqle is not available and the user has not configured the mysql server connection settings yet.

BUG: 228273
src/App.cpp
(6 / 3)
  
776776 switch( result )
777777 {
778778 case KMessageBox::Yes:
779 CollectionManager::instance()->primaryCollection()->setProperty( "collectionFolders", QStringList() << musicDir );
780 CollectionManager::instance()->startFullScan();
781 useMusicLocation = true;
779 if( CollectionManager::instance()->primaryCollection() )
780 {
781 CollectionManager::instance()->primaryCollection()->setProperty( "collectionFolders", QStringList() << musicDir );
782 CollectionManager::instance()->startFullScan();
783 useMusicLocation = true;
784 }
782785 break;
783786
784787 case KMessageBox::No:
src/dialogs/CollectionSetup.cpp
(8 / 4)
  
139139 m_view->setRootIndex( m_model->setRootPath( m_model->myComputer().toString() ) );
140140 #endif
141141
142 QStringList dirs = CollectionManager::instance()->primaryCollection()->property( "collectionFolders" ).toStringList();
142 Amarok::Collection *primaryCollection = CollectionManager::instance()->primaryCollection();
143 QStringList dirs = primaryCollection ? primaryCollection->property( "collectionFolders" ).toStringList() : QStringList();
143144 m_model->setDirectories( dirs );
144145
145146 // make sure that the tree is expanded to show all selected items
……
158158{
159159 DEBUG_BLOCK
160160
161 QStringList collectionFolders = CollectionManager::instance()->primaryCollection()->property( "collectionFolders" ).toStringList();
161 Amarok::Collection *primaryCollection = CollectionManager::instance()->primaryCollection();
162 QStringList collectionFolders = primaryCollection ? primaryCollection->property( "collectionFolders" ).toStringList() : QStringList();
162163 const bool foldersChanged = m_model->directories() != collectionFolders;
163164 const bool recursiveChanged = m_recursive->isChecked() != AmarokConfig::scanRecursively();
164165 const bool monitorChanged = m_monitor->isChecked() != AmarokConfig::monitorChanges();
……
177177 AmarokConfig::setMonitorChanges( monitor() );
178178 AmarokConfig::setUseCharsetDetector( charset() );
179179
180 QStringList collectionFolders = CollectionManager::instance()->primaryCollection()->property( "collectionFolders" ).toStringList();
180 Amarok::Collection *primaryCollection = CollectionManager::instance()->primaryCollection();
181 QStringList collectionFolders = primaryCollection ? primaryCollection->property( "collectionFolders" ).toStringList() : QStringList();
181182
182183 if( m_model->directories() != collectionFolders )
183184 {
184185 debug() << "Selected collection folders: " << m_model->directories();
185 CollectionManager::instance()->primaryCollection()->setProperty( "collectionFolders", m_model->directories() );
186 if( primaryCollection )
187 primaryCollection->setProperty( "collectionFolders", m_model->directories() );
186188
187189 debug() << "MountPointManager collection folders: " << collectionFolders;
188190 CollectionManager::instance()->startFullScan();