Skip to content

Commit 3c70150

Browse files
wonder-skjef-n
authored andcommitted
Avoid crash if no project file is selected and OK is clicked
(cherry picked from commit 6318f67)
1 parent 3dd8008 commit 3c70150

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

src/app/qgisapp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8032,7 +8032,7 @@ void QgisApp::embedLayers()
80328032
{
80338033
//dialog to select groups/layers from other project files
80348034
QgsProjectLayerGroupDialog d( this );
8035-
if ( d.exec() == QDialog::Accepted )
8035+
if ( d.exec() == QDialog::Accepted && d.isValid() )
80368036
{
80378037
mMapCanvas->freeze( true );
80388038

src/app/qgsprojectlayergroupdialog.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,11 @@ QString QgsProjectLayerGroupDialog::selectedProjectFile() const
102102
return mProjectFileLineEdit->text();
103103
}
104104

105+
bool QgsProjectLayerGroupDialog::isValid() const
106+
{
107+
return mTreeView->layerTreeModel() != 0;
108+
}
109+
105110
void QgsProjectLayerGroupDialog::on_mBrowseFileToolButton_clicked()
106111
{
107112
//line edit might emit editingFinished signal when loosing focus

src/app/qgsprojectlayergroupdialog.h

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ class APP_EXPORT QgsProjectLayerGroupDialog: public QDialog, private Ui::QgsProj
3636
QStringList selectedLayerNames() const;
3737
QString selectedProjectFile() const;
3838

39+
bool isValid() const;
40+
3941
private slots:
4042
void on_mBrowseFileToolButton_clicked();
4143
void on_mProjectFileLineEdit_editingFinished();

0 commit comments

Comments
 (0)