(a00338777) v0.9.2.1

2019-08-26 19:58:19 +03:00
parent 0f63da27b2
commit 80698b58b0
311 changed files with 11763 additions and 4507 deletions
@@ -142,6 +142,7 @@ namespace Barotrauma
            }
            catch (Exception e)
            {
+                handle.Exception = e;
                DebugConsole.ThrowError("Coroutine \"" + handle.Name + "\" has thrown an exception", e);
            }
        }
@@ -182,7 +183,7 @@ namespace Barotrauma
                {
                    if (handle.Thread.ThreadState.HasFlag(ThreadState.Stopped))
                    {
-                        if ((CoroutineStatus)handle.Coroutine.Current == CoroutineStatus.Failure)
+                        if (handle.Exception!=null || (CoroutineStatus)handle.Coroutine.Current == CoroutineStatus.Failure)
                        {
                            DebugConsole.ThrowError("Coroutine \"" + handle.Name + "\" has failed");
                        }