(d211acd47) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-03-28 18:12:09 +02:00
parent 2490951b2b
commit f3dc34dfa3
5 changed files with 79 additions and 8 deletions
@@ -1652,7 +1652,8 @@ namespace Barotrauma
 #if CLIENT
            if (isLocalPlayer)
            {
-                if (GUI.MouseOn == null && !CharacterInventory.IsMouseOnInventory())
+                if (GUI.MouseOn == null && 
+                    (!CharacterInventory.IsMouseOnInventory() || CharacterInventory.DraggingItemToWorld))
                {
                    if (findFocusedTimer <= 0.0f || Screen.Selected == GameMain.SubEditorScreen)
                    {