NWN: Avoid a possible memory leak in CharGenChoices

xoreos · May 4, 2016 · 6f069ab · 6f069ab
1 parent 70dba7c
commit 6f069ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/engines/nwn/gui/chargen/chargenchoices.cpp b/src/engines/nwn/gui/chargen/chargenchoices.cpp
@@ -35,14 +35,15 @@ namespace Engines {
 
 namespace NWN {
 
-CharGenChoices::CharGenChoices() {
+CharGenChoices::CharGenChoices() : _characterUsed(false) {
 	_creature = new Creature();
 
 	init();
 }
 
 CharGenChoices::~CharGenChoices() {
-	delete _creature;
+	if (!_characterUsed)
+		delete _creature;
 }
 
 void CharGenChoices::init() {

diff --git a/src/engines/nwn/gui/chargen/chargenchoices.h b/src/engines/nwn/gui/chargen/chargenchoices.h
@@ -98,6 +98,7 @@ class CharGenChoices {
 	uint8 _domain2;
 
 	void init();
+	bool _characterUsed;
 };
 
 } // End of namespace NWN