fix merge conflict

xiaoyifang · Jul 2, 2022 · 4d81b3b · 4d81b3b
2 parents 9f5218b + d8d3002
commit 4d81b3b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/articleview.cc b/articleview.cc
@@ -2495,10 +2495,13 @@ void ArticleView::highlightFTSResults()
     {
       const QUrl & url = ui.definition->url();
 
-      bool ignoreDiacritics = Utils::Url::hasQueryItem( url, "ignore_diacritics" );
-
       QString regString = Utils::Url::queryItemValue( url, "regexp" );
-      if( ignoreDiacritics )
+	  if( regString.isEmpty() )
+	    return;
+
+      bool ignoreDiacritics = Utils::Url::hasQueryItem( url, "ignore_diacritics" );
+
+	  if( ignoreDiacritics )
         regString = gd::toQString( Folding::applyDiacriticsOnly( gd::toWString( regString ) ) );
       else
         regString = regString.remove( AccentMarkHandler::accentMark() );