replaced my recent GSocket_SetReuseAddr() addition with GSocket_SetReusable() from...

[wxWidgets.git] / src / common / log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index f4250830b41f36e539058f1e4353319587f7164e..98e8b62cd966ea2350d5f6173edb9b024544fe25 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -199,7 +199,10 @@ void wxLogFatalError(const wxChar *szFormat, ...)
     va_list argptr;
     va_start(argptr, szFormat);
     wxVLogFatalError(szFormat, argptr);
     va_list argptr;
     va_start(argptr, szFormat);
     wxVLogFatalError(szFormat, argptr);

-    va_end(argptr);
+
+    // some compilers warn about unreachable code and it shouldn't matter
+    // for the others anyhow...
+    //va_end(argptr);

 }
 
 // same as info, but only if 'verbose' mode is on
 }
 
 // same as info, but only if 'verbose' mode is on


@@ -627,12 +630,16 @@ void wxLogChain::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
     {
         // bogus cast just to access protected DoLog
         ((wxLogChain *)m_logOld)->DoLog(level, szString, t);
     {
         // bogus cast just to access protected DoLog
         ((wxLogChain *)m_logOld)->DoLog(level, szString, t);

+
+        m_bHasMessages |= m_logOld->HasPendingMessages();

     }
 
     if ( m_logNew && m_logNew != this )
     {
         // as above...
         ((wxLogChain *)m_logNew)->DoLog(level, szString, t);
     }
 
     if ( m_logNew && m_logNew != this )
     {
         // as above...
         ((wxLogChain *)m_logNew)->DoLog(level, szString, t);

+
+        m_bHasMessages |= m_logNew->HasPendingMessages();

     }
 }
 
     }
 }