Avoid infinite sort loop when gathering feature lists for the value r…

…elation editor widget
opengisch · Dec 3, 2024 · 7f93da4 · 7f93da4 · qfield-fairy · Dec 3, 2024
1 parent 52e2f84
commit 7f93da4
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/core/featurelistmodel.cpp b/src/core/featurelistmodel.cpp
@@ -398,16 +398,14 @@ void FeatureListModel::processFeatureList()
   if ( mOrderByValue || !mGroupField.isEmpty() || !mSearchTerm.isEmpty() )
   {
     std::sort( entries.begin(), entries.end(), [=]( const Entry &entry1, const Entry &entry2 ) {
-      if ( entry1.key.isNull() )
+      if ( entry1.key.isNull() && !entry2.key.isNull() )
         return true;
 
-      if ( entry2.key.isNull() )
+      if ( !entry1.key.isNull() && entry2.key.isNull() )
         return false;
 
       if ( !mGroupField.isEmpty() && entry1.group != entry2.group )
-      {
         return entry1.group < entry2.group;
-      }
 
       if ( !mSearchTerm.isEmpty() )
       {