From fd7e7e4c05ee90d5fd1b22b0d06c3c586a7c4451 Mon Sep 17 00:00:00 2001
From: Gamer025 <33846895+Gamer025@users.noreply.github.com>
Date: Fri, 10 Sep 2021 19:32:29 +0200
Subject: [PATCH] Add fingerprints before putting item in hand (#61330)

Fixes runtimes when crafting stack items and already having a matching stack in your hand
---
 code/game/objects/items/stacks/stack.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index cee4fd1e55e..c25435e2dcc 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -289,9 +289,9 @@
 			if(QDELETED(O))
 				return //It's a stack and has already been merged
 
+			O.add_fingerprint(usr) //Add fingerprints first, otherwise O might already be deleted because of stack merging
 			if(isitem(O))
 				usr.put_in_hands(O)
-			O.add_fingerprint(usr)
 
 			//BubbleWrap - so newly formed boxes are empty
 			if(istype(O, /obj/item/storage))