Merge pull request #2166 from shenlebantongying/fix/dict-ion

fix custom dict icon loading with special chars `[]*?`
xiaoyifang · Feb 18, 2025 · 5bcc3aa · 5bcc3aa
2 parents 1f8ab0e + 47638e6
commit 5bcc3aa
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/dict/dictionary.cc b/src/dict/dictionary.cc
@@ -251,22 +251,22 @@ int Class::getOptimalIconSize()
 bool Class::loadIconFromFileName( QString const & mainDictFileName )
 {
   const QFileInfo info( mainDictFileName );
-  const QString basename = info.baseName();
-  QDir dir               = info.absoluteDir();
+  QDir dir = info.absoluteDir();
 
   dir.setFilter( QDir::Files );
-  dir.setNameFilters( QStringList() << basename + ".bmp"  //
-                                    << basename + ".png"  //
-                                    << basename + ".jpg"  //
-                                    << basename + ".ico"  // below are GD-ng only
-                                    << basename + ".jpeg" //
-                                    << basename + ".gif"  //
-                                    << basename + ".webp" //
-                                    << basename + ".svgz" //
-                                    << basename + ".svg" );
+  dir.setNameFilters( QStringList() << "*.bmp"  //
+                                    << "*.png"  //
+                                    << "*.jpg"  //
+                                    << "*.ico"  // below are GD-ng only
+                                    << "*.jpeg" //
+                                    << "*.gif"  //
+                                    << "*.webp" //
+                                    << "*.svg"  //
+                                    << "*.svgz" );
 
+  const QString basename = info.baseName();
   for ( const auto & f : dir.entryInfoList() ) {
-    if ( loadIconFromFilePath( f.absoluteFilePath() ) ) {
+    if ( f.baseName() == basename && loadIconFromFilePath( f.absoluteFilePath() ) ) {
       return true;
     }
   }