File sharing fixes: canceling transfers, displaying transfers & progress server-side, invalid sub files aren't selected or sent

2016-02-27 00:25:13 +02:00
parent 9f8f4e290e
commit 7309201b11
9 changed files with 217 additions and 83 deletions
@@ -631,12 +631,16 @@ namespace Barotrauma

            if (extension == ".sub")
            {
-                Stream stream = SaveUtil.DecompressFiletoStream(file);
-                if (stream == null)
+                Stream stream = null;
+                try
                {
-                    DebugConsole.ThrowError("Loading submarine ''" + file + "'' failed!");
-                    return null;
+                    stream = SaveUtil.DecompressFiletoStream(file);
                }
+                catch (Exception e)
+                {
+                    DebugConsole.ThrowError("Loading submarine ''" + file + "'' failed!", e);
+                    return null;
+                }                

                try
                {