From 66b27875e06dedb156b76caacdedc213d6affb87 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 27 Aug 2019 04:00:22 +0300
Subject: [PATCH] Fix possible null exception

---
 osu.Game/Overlays/SocialOverlay.cs | 49 ++++++++++++++++--------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Overlays/SocialOverlay.cs b/osu.Game/Overlays/SocialOverlay.cs
index 8353e2d683..22d1471229 100644
--- a/osu.Game/Overlays/SocialOverlay.cs
+++ b/osu.Game/Overlays/SocialOverlay.cs
@@ -184,33 +184,36 @@ namespace osu.Game.Overlays
 
             IEnumerable<User> sortedUsers = newUsers;
 
-            switch (Filter.Tabs.Current.Value)
+            if (sortedUsers.Any())
             {
-                case SocialSortCriteria.Location:
-                    switch (sortDirection)
-                    {
-                        case SortDirection.Ascending:
-                            sortedUsers = newUsers.OrderBy(u => u.Country.FullName);
-                            break;
+                switch (Filter.Tabs.Current.Value)
+                {
+                    case SocialSortCriteria.Location:
+                        switch (sortDirection)
+                        {
+                            case SortDirection.Ascending:
+                                sortedUsers = sortedUsers.OrderBy(u => u.Country.FullName);
+                                break;
 
-                        case SortDirection.Descending:
-                            sortedUsers = newUsers.OrderByDescending(u => u.Country.FullName);
-                            break;
-                    }
-                    break;
+                            case SortDirection.Descending:
+                                sortedUsers = sortedUsers.OrderByDescending(u => u.Country.FullName);
+                                break;
+                        }
+                        break;
 
-                case SocialSortCriteria.Name:
-                    switch (sortDirection)
-                    {
-                        case SortDirection.Ascending:
-                            sortedUsers = newUsers.OrderBy(u => u.Username);
-                            break;
+                    case SocialSortCriteria.Name:
+                        switch (sortDirection)
+                        {
+                            case SortDirection.Ascending:
+                                sortedUsers = sortedUsers.OrderBy(u => u.Username);
+                                break;
 
-                        case SortDirection.Descending:
-                            sortedUsers = newUsers.OrderByDescending(u => u.Username);
-                            break;
-                    }
-                    break;
+                            case SortDirection.Descending:
+                                sortedUsers = sortedUsers.OrderByDescending(u => u.Username);
+                                break;
+                        }
+                        break;
+                }
             }
 
             Users = sortedUsers;