Avoid crash if no project file is selected and OK is clicked

wonder-sk · wonder-sk · commit 6318f67bfc62 · 2015-05-26T03:35:34.000+02:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -8129,7 +8129,7 @@ void QgisApp::embedLayers()
 {
   //dialog to select groups/layers from other project files
   QgsProjectLayerGroupDialog d( this );
-  if ( d.exec() == QDialog::Accepted )
+  if ( d.exec() == QDialog::Accepted && d.isValid() )
   {
     mMapCanvas->freeze( true );
 
diff --git a/src/app/qgsprojectlayergroupdialog.cpp b/src/app/qgsprojectlayergroupdialog.cpp
@@ -102,6 +102,11 @@ QString QgsProjectLayerGroupDialog::selectedProjectFile() const
   return mProjectFileLineEdit->text();
 }
 
+bool QgsProjectLayerGroupDialog::isValid() const
+{
+  return mTreeView->layerTreeModel() != 0;
+}
+
 void QgsProjectLayerGroupDialog::on_mBrowseFileToolButton_clicked()
 {
   //line edit might emit editingFinished signal when loosing focus
diff --git a/src/app/qgsprojectlayergroupdialog.h b/src/app/qgsprojectlayergroupdialog.h
@@ -36,6 +36,8 @@ class APP_EXPORT QgsProjectLayerGroupDialog: public QDialog, private Ui::QgsProj
     QStringList selectedLayerNames() const;
     QString selectedProjectFile() const;
 
+    bool isValid() const;
+
   private slots:
     void on_mBrowseFileToolButton_clicked();
     void on_mProjectFileLineEdit_editingFinished();

Original file line number	Diff line number	Diff line change
`@@ -8129,7 +8129,7 @@ void QgisApp::embedLayers()`
`8129`	`8129`	`{`
`8130`	`8130`	`//dialog to select groups/layers from other project files`
`8131`	`8131`	`QgsProjectLayerGroupDialog d( this );`
`8132`		`- if ( d.exec() == QDialog::Accepted )`
	`8132`	`+ if ( d.exec() == QDialog::Accepted && d.isValid() )`
`8133`	`8133`	`{`
`8134`	`8134`	`mMapCanvas->freeze( true );`
`8135`	`8135`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,11 @@ QString QgsProjectLayerGroupDialog::selectedProjectFile() const`
`102`	`102`	`return mProjectFileLineEdit->text();`
`103`	`103`	`}`
`104`	`104`
	`105`	`+bool QgsProjectLayerGroupDialog::isValid() const`
	`106`	`+{`
	`107`	`+ return mTreeView->layerTreeModel() != 0;`
	`108`	`+}`
	`109`	`+`
`105`	`110`	`void QgsProjectLayerGroupDialog::on_mBrowseFileToolButton_clicked()`
`106`	`111`	`{`
`107`	`112`	`//line edit might emit editingFinished signal when loosing focus`