[themes] Handle non-existent theme name setting in app stylesheet

qgis · Feb 20, 2019 · 82e189e · 82e189e
1 parent 2a148e2
commit 82e189e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/app/qgisappstylesheet.cpp b/src/app/qgisappstylesheet.cpp
@@ -124,7 +124,7 @@ void QgisAppStyleSheet::buildStyleSheet( const QMap<QString, QVariant> &opts )
   ss += QLatin1String( "QGroupBox{ font-weight: 600; }" );
 
   QString themeName = settings.value( QStringLiteral( "UI/UITheme" ), "default" ).toString();
-  if ( themeName == QStringLiteral( "default" ) )
+  if ( themeName == QStringLiteral( "default" ) || !QgsApplication::uiThemes().contains( themeName ) )
   {
     //sidebar style
     QString style = "QListWidget#mOptionsListWidget {"

diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -567,6 +567,10 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
   whileBlocking( cmbStyle )->setCurrentIndex( cmbStyle->findText( name, Qt::MatchFixedString ) );
 
   QString theme = mSettings->value( QStringLiteral( "UI/UITheme" ), QStringLiteral( "default" ) ).toString();
+  if ( !QgsApplication::uiThemes().contains( theme ) )
+  {
+    theme = QStringLiteral( "default" );
+  }
   whileBlocking( cmbUITheme )->setCurrentIndex( cmbUITheme->findText( theme, Qt::MatchFixedString ) );
 
   mNativeColorDialogsChkBx->setChecked( mSettings->value( QStringLiteral( "/qgis/native_color_dialogs" ), false ).toBool() );