Merge branch 'master' into storage-improvements

ppy · Aug 2, 2017 · dca2603 · dca2603
2 parents 9a5d525 + 46abae5
commit dca2603
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/osu.Framework/Extensions/ExtensionMethods.cs b/osu.Framework/Extensions/ExtensionMethods.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -153,7 +154,16 @@ public static string GetDescription(this Enum value)
         public static void ThrowIfFaulted(this Task task)
         {
             if (task.IsFaulted)
-                ExceptionDispatchInfo.Capture(task.Exception?.InnerException).Throw();
+            {
+                Exception e = task.Exception;
+
+                Debug.Assert(e != null);
+
+                while (e.InnerException != null)
+                    e = e.InnerException;
+
+                ExceptionDispatchInfo.Capture(e).Throw();
+            }
         }
 
         /// <summary>