--- a/src/misc_gui.cpp	Tue May 27 23:10:42 2008 +0000
+++ b/src/misc_gui.cpp	Tue May 27 23:40:36 2008 +0000
@@ -1093,8 +1093,9 @@
 	~QueryStringWindow()
 	{
 		if (!this->handled && this->parent != NULL) {
-			this->handled = true;
-			this->parent->OnQueryTextFinished(NULL);
+			Window *parent = this->parent;
+			this->parent = NULL; // so parent doesn't try to delete us again
+			parent->OnQueryTextFinished(NULL);
 		}
 		ClrBit(_no_scroll, SCROLL_EDIT);
 	}