X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c9919467b422edf561753db25605bc7aa293b55..c13d6ac1ea199d1e3908d40d129e2fd5a4d82df7:/src/x11/evtloop.cpp diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp index 6cd9b2b24a..146fabde14 100644 --- a/src/x11/evtloop.cpp +++ b/src/x11/evtloop.cpp @@ -6,7 +6,7 @@ // Created: 01.06.01 // RCS-ID: $Id$ // Copyright: (c) 2002 Julian Smart -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -128,7 +128,7 @@ wxGUIEventLoop::~wxGUIEventLoop() int wxGUIEventLoop::Run() { // event loops are not recursive, you need to create another loop! - wxCHECK_MSG( !IsRunning(), -1, wxT("can't reenter a message loop") ); + wxCHECK_MSG( !m_impl, -1, wxT("can't reenter a message loop") ); m_impl = new wxEventLoopImpl; @@ -162,18 +162,18 @@ int wxGUIEventLoop::Run() OnExit(); int exitcode = m_impl->GetExitCode(); - delete m_impl; - m_impl = NULL; + wxDELETE(m_impl); return exitcode; } void wxGUIEventLoop::Exit(int rc) { - wxCHECK_RET( IsRunning(), wxT("can't call Exit() if not running") ); - - m_impl->SetExitCode(rc); - m_impl->m_keepGoing = false; + if ( m_impl ) + { + m_impl->SetExitCode(rc); + m_impl->m_keepGoing = false; + } } // ----------------------------------------------------------------------------