From a5afc2226ce8eb8f7d9520b5448aa88a4fbeeaa7 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 11 Mar 2021 21:12:14 +0100
Subject: [PATCH] fixed sorting lost issue in Network

---
 retroshare-gui/src/gui/common/NewFriendList.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/retroshare-gui/src/gui/common/NewFriendList.cpp b/retroshare-gui/src/gui/common/NewFriendList.cpp
index 58d4966e5..5c7254606 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.cpp
+++ b/retroshare-gui/src/gui/common/NewFriendList.cpp
@@ -105,6 +105,13 @@
 
 Q_DECLARE_METATYPE(ElidedLabel*)
 
+#ifdef DEBUG_NEW_FRIEND_LIST
+static std::ostream& operator<<(std::ostream& o,const QModelIndex& i)
+{
+    return o << "(" << i.row() << "," << i.column() << ")";
+}
+#endif
+
 class FriendListSortFilterProxyModel: public QSortFilterProxyModel
 {
 public:
@@ -131,6 +138,9 @@ public:
         if((online1 != online2) && m_sortByState)
 			return (m_header->sortIndicatorOrder()==Qt::AscendingOrder)?online1:online2 ;    // always put online nodes first
 
+#ifdef DEBUG_NEW_FRIEND_LIST
+        std::cerr << "Comparing index " << left << " with index " << right << std::endl;
+#endif
         return QSortFilterProxyModel::lessThan(left,right);
 	}
 
@@ -1174,7 +1184,9 @@ void NewFriendList::applyWhileKeepingTree(std::function<void()> predicate)
 #ifdef DEBUG_NEW_FRIEND_LIST
     std::cerr << "Sorting again with sort column: " << mLastSortColumn << " and order " << mLastSortOrder << std::endl;
 #endif
+    mProxyModel->setSortingEnabled(true);
     mProxyModel->sort(mLastSortColumn,mLastSortOrder);
+    mProxyModel->setSortingEnabled(false);
 
     if(selected_index.isValid())
         ui->peerTreeWidget->scrollTo(selected_index);