Merge https://github.com/coelckers/gzdoom

ZDoom · Jul 10, 2017 · e274410 · e274410
2 parents d2c8a5c + 2e33165
commit e274410
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/g_shared/hudmessages.cpp b/src/g_shared/hudmessages.cpp
@@ -150,7 +150,7 @@ DHUDMessage::DHUDMessage (FFont *font, const char *text, float x, float y, int h
 //
 //============================================================================
 
-DHUDMessage::~DHUDMessage ()
+void DHUDMessage::OnDestroy()
 {
 	if (Lines)
 	{
@@ -164,6 +164,7 @@ DHUDMessage::~DHUDMessage ()
 	if (SourceText != NULL)
 	{
 		delete[] SourceText;
+		SourceText = nullptr;
 	}
 }
 

diff --git a/src/g_statusbar/sbar.h b/src/g_statusbar/sbar.h
@@ -66,7 +66,7 @@ class DHUDMessage : public DObject
 public:
 	DHUDMessage (FFont *font, const char *text, float x, float y, int hudwidth, int hudheight,
 		EColorRange textColor, float holdTime);
-	virtual ~DHUDMessage ();
+	virtual void OnDestroy () override;
 
 	virtual void Serialize(FSerializer &arc);