sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix qgis crash on startup (invalid pointer)

Browse Source
This commit is contained in:
myarjunar 2017-08-22 13:46:21 +07:00 committed by Nyall Dawson
parent bea89b32ca
commit 92a1550b18
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/providers/ows/qgsowsdataitems.cpp
View File

@ -262,11 +262,15 @@ void QgsOWSRootItem::newConnection()
static QStringList extensions = QStringList(); static QStringList extensions = QStringList();
static QStringList wildcards = QStringList(); static QStringList wildcards = QStringList();
QGISEXTERN QList<QgsDataItemProvider *> dataItemProviders() QGISEXTERN QList<QgsDataItemProvider *> *dataItemProviders()
{ {
return QList<QgsDataItemProvider *>() QList<QgsDataItemProvider *> *providers = new QList<QgsDataItemProvider *>();
*providers
<< new QgsOwsDataItemProvider << new QgsOwsDataItemProvider
<< new QgsGeoNodeDataItemProvider; << new QgsGeoNodeDataItemProvider;
return providers;
} }
QgsDataItem *QgsOwsDataItemProvider::createDataItem( const QString &path, QgsDataItem *parentItem ) QgsDataItem *QgsOwsDataItemProvider::createDataItem( const QString &path, QgsDataItem *parentItem )

9
src/providers/wfs/qgswfsdataitems.cpp
View File

@ -309,8 +309,11 @@ QGISEXTERN QgsDataItem *dataItem( QString path, QgsDataItem *parentItem )
return nullptr; return nullptr;
} }
QGISEXTERN QList<QgsDataItemProvider *> dataItemProviders() QGISEXTERN QList<QgsDataItemProvider *> *dataItemProviders()
{ {
return QList<QgsDataItemProvider *>() QList<QgsDataItemProvider *> *providers = new QList<QgsDataItemProvider *>();
<< new QgsWfsDataItemProvider;
*providers << new QgsWfsDataItemProvider;
return providers;
} }