From 384170a93ed0ef61e7cab20f19ee91f2dad5f6f7 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 26 Mar 2018 23:15:47 +0300
Subject: Fix possible sorting issues in party.

---
 src/party.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/party.cpp b/src/party.cpp
index 63c8e62ad..af4a27780 100644
--- a/src/party.cpp
+++ b/src/party.cpp
@@ -37,13 +37,12 @@ static class SortPartyFunctor final
         bool operator() (const PartyMember *const p1,
                          const PartyMember *const p2) const
         {
-            if ((p1 == nullptr) || (p2 == nullptr))
+            if (p1 == nullptr || p2 == nullptr)
                 return false;
-            if (p1->getLeader())
-                return true;
-            if (p2->getLeader())
-                return false;
-
+            const int leader1 = CAST_S32(p1->getLeader());
+            const int leader2 = CAST_S32(p2->getLeader());
+            if (leader1 != leader2)
+                return leader1 >= leader2;
             if (p1->getName() != p2->getName())
             {
                 std::string s1 = p1->getName();
-- 
cgit v1.2.3-60-g2f50