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 segfault when editor widget is invalid on form init

Browse Source 
"editor" can be null in that case
This commit is contained in:
Alessandro Pasotti 2015-11-19 15:24:46 +01:00 committed by Matthias Kuhn
parent c40a764f5c
commit d315a12362
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
View File

@ -351,23 +351,28 @@ QString QgsEditorWidgetRegistry::findSuitableWrapper( QWidget* editor, const QSt
QMap<const char*, QPair<int, QString> >::ConstIterator it;
QString widgetid;
int weight = 0;
it = mFactoriesByType.constBegin();
for ( ; it != mFactoriesByType.constEnd(); ++it )
// Editor can be null
if ( editor )
{
if ( editor->staticMetaObject.className() == it.key() )
int weight = 0;
it = mFactoriesByType.constBegin();
for ( ; it != mFactoriesByType.constEnd(); ++it )
{
// if it's a perfect match: return it directly
return it.value().second;
}
else if ( editor->inherits( it.key() ) )
{
// if it's a subclass, continue evaluating, maybe we find a more-specific or one with more weight
if ( it.value().first > weight )
if ( editor->staticMetaObject.className() == it.key() )
{
weight = it.value().first;
widgetid = it.value().second;
// if it's a perfect match: return it directly
return it.value().second;
}
else if ( editor->inherits( it.key() ) )
{
// if it's a subclass, continue evaluating, maybe we find a more-specific or one with more weight
if ( it.value().first > weight )
{
weight = it.value().first;
widgetid = it.value().second;
}
}
}
}