From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 12 Sep 2009 22:40:18 +0000 (+0000)
Subject: Unregister wake up pipe file fd in ~wxConsoleEventLoop.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c8299fa80cf23b0f1af2200e4a91d6d5fbb4a580

Unregister wake up pipe file fd in ~wxConsoleEventLoop.

We must unregister the wake up pipe file descriptor which we register with the
IO dispatcher in wxConsoleEventLoop ctor, otherwise doing it the next time
(i.e. if wxConsoleEventLoop is deleted and recreated) results in asserts, at
least when using wxSelectDispatcher and not wxEpollDispatcher (i.e. under any
non-Linux Unix system).

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

diff --git a/src/unix/evtloopunix.cpp b/src/unix/evtloopunix.cpp
index a44933e593..3baef89f9b 100644
--- a/src/unix/evtloopunix.cpp
+++ b/src/unix/evtloopunix.cpp
@@ -176,7 +176,15 @@ wxConsoleEventLoop::wxConsoleEventLoop()
 
 wxConsoleEventLoop::~wxConsoleEventLoop()
 {
-    delete m_wakeupPipe;
+    if ( m_wakeupPipe )
+    {
+        if ( m_dispatcher )
+        {
+            m_dispatcher->UnregisterFD(m_wakeupPipe->GetReadFd());
+        }
+
+        delete m_wakeupPipe;
+    }
 }
 
 //-----------------------------------------------------------------------------