(svn r13133) -Codechange: Add a base class (descending from Window) for all new windows that are going to require a ResetObjectToPlace to be performed on closing.

This will allow to free the said window only once, and not twice otherwise

1 files changed, 10 insertions, 0 deletions

diff --git a/src/window.cpp b/src/window.cpp
index 1b7430aee..c9bead7fd 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -2350,3 +2350,13 @@ void RelocateAllWindows(int neww, int newh)
 		w->top = top;
 	}
 }
+
+/** Destructor of the base class PickerWindowBase
+ * Main utility is to stop the base Window destructor from triggering
+ * a free while the child will already be free, in this case by the ResetObjectToPlace().
+ */
+PickerWindowBase::~PickerWindowBase()
+{
+	this->window_class = WC_INVALID; // stop the ancestor from freeing the already (to be) child
+	ResetObjectToPlace();
+}