From 91e83bf3c6cfeb8b0f991a0efebb381ae33a10c5 Mon Sep 17 00:00:00 2001
From: ZZYZX <zzyzx@virtual>
Date: Sun, 12 Mar 2017 05:16:44 +0200
Subject: [PATCH] Fixed DECORATE scope for duplicates

---
 src/scripting/decorate/thingdef_parse.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/scripting/decorate/thingdef_parse.cpp b/src/scripting/decorate/thingdef_parse.cpp
index 9ad5e0e67..7ccc0b7d7 100644
--- a/src/scripting/decorate/thingdef_parse.cpp
+++ b/src/scripting/decorate/thingdef_parse.cpp
@@ -97,7 +97,8 @@ PClassActor *DecoDerivedClass(const FScriptPosition &sc, PClassActor *parent, FN
 			sc.Message(MSG_FATAL, "Tried to define class '%s' more than twice in the same file.", typeName.GetChars());
 		}
 	}
-	else
+	
+	if (type != nullptr)
 	{
 		// [ZZ] DECORATE classes are always play
 		type->ObjectFlags = FScopeBarrier::ChangeSideInObjectFlags(type->ObjectFlags, FScopeBarrier::Side_Play);