Merge pull request tgstation#14308 from tgstation/duncathan-patch-1

Cancelling while adding a custom objective no longer adds a free objective
topham1 · Jan 5, 2016 · 3108162 · 3108162
2 parents 4e81912 + f1783bc
commit 3108162
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
@@ -633,7 +633,8 @@
 		if (istype(new_objective, /datum/objective/custom)) //it's lame I know but this type is snowflaky by its very nature
 			var/expl = stripped_input(usr, "Custom objective:", "Objective", objective ? objective.explanation_text : "")
 			if (!expl)
-				expl = "Free objective"
+				qdel(new_objective)
+				return
 			new_objective.explanation_text = expl
 
 		if (!new_objective)