Merge pull request #4 from pfthroaway/master

Fixed a crash occurring when holding an item and clicking between the…
Oen44 · Nov 3, 2019 · a7dedc3 · a7dedc3
2 parents af5b78d + 8a982f2
commit a7dedc3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Inventory.gd b/Inventory.gd
@@ -70,7 +70,10 @@ func _gui_input(event):
 				clickedSlot = slot;
 
 		if holdingItem == null and clickedSlot == null:
-			return
+			return;
+
+		if clickedSlot == null:
+			return;
 
 		if holdingItem != null and clickedSlot != null:
 			if clickedSlot.item != null:

diff --git a/Inventory.tscn b/Inventory.tscn
@@ -32,7 +32,7 @@ margin_right = 154.0
 margin_bottom = 193.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
-mouse_filter = 2
+mouse_filter = 1
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1