Merge branch 'main' into newdiscord

2021-01-15 10:35:20 +01:00
parent 9079f1c59c e0cc74a712
commit 04109a133f
6 changed files with 27 additions and 9 deletions
--- a/PluralKit.Bot/Utils/MiscUtils.cs
+++ b/PluralKit.Bot/Utils/MiscUtils.cs
@@ -76,7 +76,7 @@ namespace PluralKit.Bot
            if (e is WebhookExecutionErrorOnDiscordsEnd) return false;
            
            // Socket errors are *not our problem*
-            if (e is SocketException) return false;
+            if (e.GetBaseException() is SocketException) return false;
            
            // Tasks being cancelled for whatver reason are, you guessed it, also not our problem.
            if (e is TaskCanceledException) return false;