External Resource Widget: avoid having undefined value in document viewer type combobox

3nids · 3nids · commit 5b46f487ac21 · 2016-02-22T13:45:32.000+01:00
diff --git a/src/gui/editorwidgets/qgsexternalresourceconfigdlg.cpp b/src/gui/editorwidgets/qgsexternalresourceconfigdlg.cpp
@@ -207,7 +207,11 @@ void QgsExternalResourceConfigDlg::setConfig( const QgsEditorWidgetConfig& confi
   {
     QgsExternalResourceWidget::DocumentViewerContent content = ( QgsExternalResourceWidget::DocumentViewerContent )config.value( "DocumentViewer" ).toInt();
     mDocumentViewerGroupBox->setChecked( content != QgsExternalResourceWidget::NoContent );
-    mDocumentViewerContentComboBox->setCurrentIndex( mDocumentViewerContentComboBox->findData( content ) );
+    int idx = mDocumentViewerContentComboBox->findData( content );
+    if ( idx >= 0 )
+    {
+      mDocumentViewerContentComboBox->setCurrentIndex( idx );
+    }
     if ( config.contains( "DocumentViewerHeight" ) )
     {
       mDocumentViewerHeight->setValue( config.value( "DocumentViewerHeight" ).toInt() );

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,11 @@ void QgsExternalResourceConfigDlg::setConfig( const QgsEditorWidgetConfig& confi`
`207`	`207`	`{`
`208`	`208`	`QgsExternalResourceWidget::DocumentViewerContent content = ( QgsExternalResourceWidget::DocumentViewerContent )config.value( "DocumentViewer" ).toInt();`
`209`	`209`	`mDocumentViewerGroupBox->setChecked( content != QgsExternalResourceWidget::NoContent );`
`210`		`- mDocumentViewerContentComboBox->setCurrentIndex( mDocumentViewerContentComboBox->findData( content ) );`
	`210`	`+ int idx = mDocumentViewerContentComboBox->findData( content );`
	`211`	`+ if ( idx >= 0 )`
	`212`	`+ {`
	`213`	`+ mDocumentViewerContentComboBox->setCurrentIndex( idx );`
	`214`	`+ }`
`211`	`215`	`if ( config.contains( "DocumentViewerHeight" ) )`
`212`	`216`	`{`
`213`	`217`	`mDocumentViewerHeight->setValue( config.value( "DocumentViewerHeight" ).toInt() );`