Fix incorrect sorting by "private" column

PR qbittorrent#21041.
sledgehammer999 · Jul 15, 2024 · 558799f · 558799f
1 parent 96607ce
commit 558799f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/gui/transferlistsortmodel.cpp b/src/gui/transferlistsortmodel.cpp
@@ -59,8 +59,8 @@ namespace
     int customCompare(const TagSet &left, const TagSet &right, const Utils::Compare::NaturalCompare<Qt::CaseInsensitive> &compare)
     {
         for (auto leftIter = left.cbegin(), rightIter = right.cbegin();
-                (leftIter != left.cend()) && (rightIter != right.cend());
-                ++leftIter, ++rightIter)
+             (leftIter != left.cend()) && (rightIter != right.cend());
+             ++leftIter, ++rightIter)
         {
             const int result = compare(leftIter->toString(), rightIter->toString());
             if (result != 0)
@@ -84,6 +84,17 @@ namespace
         return isLeftValid ? -1 : 1;
     }
 
+    int compareAsBool(const QVariant &left, const QVariant &right)
+    {
+        const bool leftValid = left.isValid();
+        const bool rightValid = right.isValid();
+        if (leftValid && rightValid)
+            return threeWayCompare(left.toBool(), right.toBool());
+        if (!leftValid && !rightValid)
+            return 0;
+        return leftValid ? -1 : 1;
+    }
+
     int adjustSubSortColumn(const int column)
     {
         return ((column >= 0) && (column < TransferListModel::NB_COLUMNS))
@@ -214,6 +225,9 @@ int TransferListSortModel::compare(const QModelIndex &left, const QModelIndex &r
     case TransferListModel::TR_UPSPEED:
         return customCompare(leftValue.toInt(), rightValue.toInt());
 
+    case TransferListModel::TR_PRIVATE:
+        return compareAsBool(leftValue, rightValue);
+
     case TransferListModel::TR_PEERS:
     case TransferListModel::TR_SEEDS:
         {

diff --git a/src/webui/api/synccontroller.cpp b/src/webui/api/synccontroller.cpp
@@ -222,6 +222,7 @@ namespace
             case QMetaType::UInt:
             case QMetaType::QDateTime:
             case QMetaType::Nullptr:
+            case QMetaType::UnknownType:
                 if (prevData[key] != value)
                     syncData[key] = value;
                 break;