Merge pull request #1386 from xiaoyifang/fix/addon-style

fix: possible crash on macos
xiaoyifang · Jan 27, 2024 · 69191e4 · 69191e4
2 parents bc8c615 + e312545
commit 69191e4
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/src/ui/stylescombobox.cc b/src/ui/stylescombobox.cc
@@ -8,7 +8,6 @@ StylesComboBox::StylesComboBox( QWidget * parent ):
   QComboBox( parent )
 {
   fill();
-  setVisible( count() > 1 );
 }
 
 void StylesComboBox::fill()
@@ -19,26 +18,25 @@ void StylesComboBox::fill()
   if ( !stylesDir.isEmpty() ) {
     QDir dir( stylesDir );
     QStringList styles = dir.entryList( QDir::Dirs | QDir::NoDotAndDotDot, QDir::LocaleAware );
-    addItems( styles );
+    if ( !styles.isEmpty() ) {
+      addItems( styles );
+    }
   }
+
+  setVisible( count() > 1 );
 }
 
 void StylesComboBox::setCurrentStyle( QString const & style )
 {
-  int nom = 0;
-  if ( !style.isEmpty() ) {
-    for ( int i = 1; i < count(); i++ )
-      if ( style.compare( itemText( i ) ) == 0 ) {
-        nom = i;
-        break;
-      }
+  int nom = findText( style );
+  if ( nom > -1 ) {
+    setCurrentIndex( nom );
   }
-  setCurrentIndex( nom );
 }
 
 QString StylesComboBox::getCurrentStyle() const
 {
   if ( currentIndex() == 0 )
-    return QString();
+    return {};
   return itemText( currentIndex() );
 }