Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv19223/src/classes
Modified Files:
FolderMonitor.cpp MEvent.cpp MessageView.cpp
Log Message:
Prevented recursion in MEvent::DispatchPending due to idle loop and wxYield in busy
cursor
Index: FolderMonitor.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/FolderMonitor.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -b -u -2 -r1.22 -r1.23
--- FolderMonitor.cpp 22 Jul 2003 22:01:39 -0000 1.22
+++ FolderMonitor.cpp 14 Sep 2003 16:10:46 -0000 1.23
@@ -604,5 +604,5 @@
// do it know, it might time out and close while we're checking the other
// folders
- MEventManager::DispatchPending();
+ MEventManager::ForceDispatchPending();
return true;
Index: MEvent.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MEvent.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -b -u -2 -r1.38 -r1.39
--- MEvent.cpp 22 Jul 2003 22:01:39 -0000 1.38
+++ MEvent.cpp 14 Sep 2003 16:10:46 -0000 1.39
@@ -27,4 +27,5 @@
# include <wx/dynarray.h>
+# include <wx/utils.h>
#endif // USE_PCH
@@ -114,4 +115,17 @@
void
MEventManager::DispatchPending(void)
+{
+ static bool gs_running = false;
+ if ( !gs_running && !g_busyCursorYield )
+ {
+ gs_running = true;
+ ForceDispatchPending();
+ gs_running = false;
+ }
+}
+
+/* static */
+void
+MEventManager::ForceDispatchPending(void)
{
// don't dispatch events while we're suspended: as Dispatch() just ignores
Index: MessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MessageView.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -b -u -2 -r1.129 -r1.130
--- MessageView.cpp 14 Sep 2003 14:10:11 -0000 1.129
+++ MessageView.cpp 14 Sep 2003 16:10:46 -0000 1.130
@@ -807,5 +807,5 @@
void **cookie)
{
- CHECK( cookie, NULL, _T("NULL cookie in GetFirstFilter") );
+ CHECK( cookie, false, _T("NULL cookie in GetFirstFilter") );
*cookie = m_filters;
@@ -820,5 +820,5 @@
void **cookie)
{
- CHECK( name && desc && enabled && cookie, NULL,
+ CHECK( name && desc && enabled && cookie, false,
_T("NULL parameter in GetNextFilter") );
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
