Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2133/src/gui
Modified Files:
wxMainFrame.cpp
Log Message:
a better fix for crash under wxGTK due to OnIdle() being called too early
Index: wxMainFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMainFrame.cpp,v
retrieving revision 1.184
retrieving revision 1.185
diff -b -u -2 -r1.184 -r1.185
--- wxMainFrame.cpp 11 Jul 2004 00:23:31 -0000 1.184
+++ wxMainFrame.cpp 11 Jul 2004 00:46:17 -0000 1.185
@@ -769,6 +769,8 @@
event.Skip();
- wxMenuBar *mbar = GetMenuBar();
- if ( !mbar )
+ // we may be called from ctor before m_FolderView is created under wxGTK
+ // (because wxTreeCtrl ctor implicitly calls wxYield() which results in an
+ // idle dispatch), ignore calls that early
+ if ( !m_FolderView )
return;
@@ -779,5 +781,5 @@
static bool s_hasFolder = true;
- bool hasFolder = m_FolderView && m_FolderView->GetFolder();
+ bool hasFolder = m_FolderView->GetFolder();
if ( hasFolder != s_hasFolder )
{
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
