--- a/src/osk_gui.cpp	Sat May 10 19:59:41 2008 +0000
+++ b/src/osk_gui.cpp	Sat May 10 21:35:20 2008 +0000
@@ -166,12 +166,13 @@
 				case OSK_WIDGET_CANCEL:
 					if (WP(w, osk_d).cancel_btn != 0) { // pass a cancel event to the parent window
 						w->parent->OnClick(e->we.click.pt, WP(w, osk_d).cancel_btn);
+						/* Window gets deleted when the parent window removes itself. */
 					} else { // or reset to original string
 						strcpy(qs->text.buf, WP(w, osk_d).orig);
 						UpdateTextBufferSize(&qs->text);
 						MoveTextBufferPos(&qs->text, WKC_END);
+						delete w;
 					}
-					delete w;
 					break;
 			}
 			/* make sure that the parent window's textbox also gets updated */