Fix a crash after adding favourites to browser when the item is not yet populated

wonder-sk · wonder-sk · commit 0aeea528c47a · 2014-10-29T09:08:31.000+07:00
The model was getting broken due to list of children being overwritten and
it was sometimes crashing in the proxy model implementation.
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -718,7 +718,8 @@ void QgsFavouritesItem::addDirectory( QString favDir )
   favDirs.append( favDir );
   settings.setValue( "/browser/favourites", favDirs );
 
-  addChildItem( new QgsDirectoryItem( this, favDir, favDir ), true );
+  if ( mPopulated )
+    addChildItem( new QgsDirectoryItem( this, favDir, favDir ), true );
 }
 
 void QgsFavouritesItem::removeDirectory( QgsDirectoryItem *item )
@@ -738,7 +739,8 @@ void QgsFavouritesItem::removeDirectory( QgsDirectoryItem *item )
     return;
   }
 
-  deleteChildItem( mChildren[idx] );
+  if ( mPopulated )
+    deleteChildItem( mChildren[idx] );
 }
 
 //-----------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -718,7 +718,8 @@ void QgsFavouritesItem::addDirectory( QString favDir )`
`718`	`718`	`favDirs.append( favDir );`
`719`	`719`	`settings.setValue( "/browser/favourites", favDirs );`
`720`	`720`
`721`		`- addChildItem( new QgsDirectoryItem( this, favDir, favDir ), true );`
	`721`	`+ if ( mPopulated )`
	`722`	`+ addChildItem( new QgsDirectoryItem( this, favDir, favDir ), true );`
`722`	`723`	`}`
`723`	`724`
`724`	`725`	`void QgsFavouritesItem::removeDirectory( QgsDirectoryItem *item )`
`@@ -738,7 +739,8 @@ void QgsFavouritesItem::removeDirectory( QgsDirectoryItem *item )`
`738`	`739`	`return;`
`739`	`740`	`}`
`740`	`741`
`741`		`- deleteChildItem( mChildren[idx] );`
	`742`	`+ if ( mPopulated )`
	`743`	`+ deleteChildItem( mChildren[idx] );`
`742`	`744`	`}`
`743`	`745`
`744`	`746`	`//-----------------------------------------------------------------------`