Fixes some auto observe runtimes (#13736)

tgstation · Aug 9, 2023 · c46c74b · c46c74b
1 parent e34f109
commit c46c74b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
@@ -842,6 +842,8 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 	if(observetarget?.observers)
 		observetarget.observers -= src
 		UNSETEMPTY(observetarget.observers)
+	if(observetarget)
+		UnregisterSignal(observetarget, COMSIG_QDELETING)
 	observetarget = null
 
 /mob/dead/observer/verb/dnr()

diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
@@ -38,7 +38,7 @@
 			. = TRUE
 		if("toggle_observe")
 			auto_observe = !auto_observe
-			if(auto_observe && !QDELETED(owner.orbiting.parent))
+			if(auto_observe && !QDELETED(owner?.orbiting?.parent))
 				owner.do_observe(owner.orbiting.parent)
 			else
 				owner.reset_perspective(null)