Correctly parent dialog to window, not browser

nyalldawson · nyalldawson · commit 7ae3864b632d · 2018-10-04T09:53:42.000+10:00
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -1530,8 +1530,12 @@ QList<QAction *> QgsProjectHomeItem::actions( QWidget *parent )
   QAction *setHome = new QAction( tr( "Set Project Home…" ), parent );
   connect( setHome, &QAction::triggered, this, [ = ]
   {
+    QWidget *parentWindow = parent;
+    while ( parentWindow->parentWidget() )
+      parentWindow = parentWindow->parentWidget();
+
     QString oldHome = QgsProject::instance()->homePath();
-    QString newPath = QFileDialog::getExistingDirectory( parent->window(), tr( "Select Project Home Directory" ), oldHome );
+    QString newPath = QFileDialog::getExistingDirectory( parentWindow, tr( "Select Project Home Directory" ), oldHome );
     if ( !newPath.isEmpty() )
     {
       QgsProject::instance()->setPresetHomePath( newPath );

Original file line number	Diff line number	Diff line change
`@@ -1530,8 +1530,12 @@ QList<QAction > QgsProjectHomeItem::actions( QWidget parent )`
`1530`	`1530`	`QAction *setHome = new QAction( tr( "Set Project Home…" ), parent );`
`1531`	`1531`	`connect( setHome, &QAction::triggered, this, [ = ]`
`1532`	`1532`	`{`
	`1533`	`+ QWidget *parentWindow = parent;`
	`1534`	`+ while ( parentWindow->parentWidget() )`
	`1535`	`+ parentWindow = parentWindow->parentWidget();`
	`1536`	`+`
`1533`	`1537`	`QString oldHome = QgsProject::instance()->homePath();`
`1534`		`- QString newPath = QFileDialog::getExistingDirectory( parent->window(), tr( "Select Project Home Directory" ), oldHome );`
	`1538`	`+ QString newPath = QFileDialog::getExistingDirectory( parentWindow, tr( "Select Project Home Directory" ), oldHome );`
`1535`	`1539`	`if ( !newPath.isEmpty() )`
`1536`	`1540`	`{`
`1537`	`1541`	`QgsProject::instance()->setPresetHomePath( newPath );`