From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 15 Jun 2011 13:33:02 +0000 (+0000)
Subject: Fix crash when creating and quickly destroying a wxTLW in wxGTK.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c0866512a7c380363876eb0a0e3f8ad729552d09

Fix crash when creating and quickly destroying a wxTLW in wxGTK.

Don't crash in timer callback added to work around broken Ubuntu 11.04 WM,
remove it when the window is being destroyed.

This corrects a crash which happened if a TLW was created and destroyed before
this timer had time to fire under Ubuntu.

Closes #13146.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 03bf36695f..5062335525 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -713,6 +713,13 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
 
 wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
 {
+    if ( m_netFrameExtentsTimerId )
+    {
+        // Don't let the timer callback fire as the window pointer passed to it
+        // will become invalid very soon.
+        g_source_remove(m_netFrameExtentsTimerId);
+    }
+
 #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
     // it can also be a (standard) dialog
     if ( HILDON_IS_WINDOW(m_widget) )