browser: emit layoutAboutToBeChanged() before destroying home item (fixes #8221)

jef-n · jef-n · commit 36bf49de19e9 · 2013-07-09T20:15:01.000+02:00
diff --git a/src/core/qgsbrowsermodel.cpp b/src/core/qgsbrowsermodel.cpp
@@ -45,12 +45,14 @@ QgsBrowserModel::~QgsBrowserModel()
 
 void QgsBrowserModel::updateProjectHome()
 {
-  int idx = mRootItems.indexOf( mProjectHome );
   QString home = QgsProject::instance()->homePath();
-
-  delete mProjectHome;
+  if ( mProjectHome && mProjectHome->path() == home )
+    return;
 
   emit layoutAboutToBeChanged();
+
+  int idx = mRootItems.indexOf( mProjectHome );
+  delete mProjectHome;
   mProjectHome = home.isNull() ? 0 : new QgsDirectoryItem( NULL, tr( "Project home" ), home );
   if ( mProjectHome )
   {
@@ -64,6 +66,7 @@ void QgsBrowserModel::updateProjectHome()
   {
     mRootItems.remove( idx );
   }
+
   emit layoutChanged();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,14 @@ QgsBrowserModel::~QgsBrowserModel()`
`45`	`45`
`46`	`46`	`void QgsBrowserModel::updateProjectHome()`
`47`	`47`	`{`
`48`		`- int idx = mRootItems.indexOf( mProjectHome );`
`49`	`48`	`QString home = QgsProject::instance()->homePath();`
`50`		`-`
`51`		`- delete mProjectHome;`
	`49`	`+ if ( mProjectHome && mProjectHome->path() == home )`
	`50`	`+ return;`
`52`	`51`
`53`	`52`	`emit layoutAboutToBeChanged();`
	`53`	`+`
	`54`	`+ int idx = mRootItems.indexOf( mProjectHome );`
	`55`	`+ delete mProjectHome;`
`54`	`56`	`mProjectHome = home.isNull() ? 0 : new QgsDirectoryItem( NULL, tr( "Project home" ), home );`
`55`	`57`	`if ( mProjectHome )`
`56`	`58`	`{`
`@@ -64,6 +66,7 @@ void QgsBrowserModel::updateProjectHome()`
`64`	`66`	`{`
`65`	`67`	`mRootItems.remove( idx );`
`66`	`68`	`}`
	`69`	`+`
`67`	`70`	`emit layoutChanged();`
`68`	`71`	`}`
`69`	`72`