(869ac975f) Merge branch 'master' into dev

2019-06-12 16:43:56 +03:00
parent eaf4f6afb8
commit e3ca616fff
28 changed files with 372 additions and 162 deletions
@@ -167,7 +167,8 @@ namespace Barotrauma
                        RewriteInputToCommandLine(input);
                    }
                    
-                    Thread.Yield();
+                    //TODO: be more clever about it
+                    Thread.Sleep(10); //sleep for 10ms to not pin the CPU super hard
                }
            }
            catch (ThreadAbortException)