oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: Safety guards for disconnects (#470)

Browse Source 
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
This commit is contained in:
Dennis Ploeger
2021-11-28 15:38:02 +01:00
committed by GitHub
parent 3e37d8a675
commit 14887c711b
1 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
addons/escoria-core/game/scenes/inventory/inventory_ui.gd
View File

@@ -91,31 +91,56 @@ func remove_item_by_id(item_id: String) -> void:
if items_ids_in_inventory.has(item_id):
var item_inventory_button = items_ids_in_inventory[item_id]
item_inventory_button.disconnect(
if item_inventory_button.is_connected(
"mouse_left_inventory_item",
escoria.inputs_manager,
"_on_mouse_left_click_inventory_item"
)
item_inventory_button.disconnect(
):
item_inventory_button.disconnect(
"mouse_left_inventory_item",
escoria.inputs_manager,
"_on_mouse_left_click_inventory_item"
)
if item_inventory_button.is_connected(
"mouse_double_left_inventory_item",
escoria.inputs_manager,
"_on_mouse_double_left_click_inventory_item"
)
item_inventory_button.disconnect(
):
item_inventory_button.disconnect(
"mouse_double_left_inventory_item",
escoria.inputs_manager,
"_on_mouse_double_left_click_inventory_item"
)
if item_inventory_button.is_connected(
"mouse_right_inventory_item",
escoria.inputs_manager,
"_on_mouse_right_click_inventory_item"
)
item_inventory_button.disconnect(
):
item_inventory_button.disconnect(
"mouse_right_inventory_item",
escoria.inputs_manager,
"_on_mouse_right_click_inventory_item"
)
if item_inventory_button.is_connected(
"inventory_item_focused",
escoria.inputs_manager,
"_on_mouse_entered_inventory_item"
)
item_inventory_button.disconnect(
):
item_inventory_button.disconnect(
"inventory_item_focused",
escoria.inputs_manager,
"_on_mouse_entered_inventory_item"
)
if item_inventory_button.is_connected(
"inventory_item_unfocused",
escoria.inputs_manager,
"_on_mouse_exited_inventory_item"
)
):
item_inventory_button.disconnect(
"inventory_item_unfocused",
escoria.inputs_manager,
"_on_mouse_exited_inventory_item"
)
get_node(inventory_ui_container).remove_item(item_inventory_button)
items_ids_in_inventory.erase(item_id)