don't lock the gs_prevCS critical section recursively (replaces patch 1857581)

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

include/wx/log.h

@@ -297,7 +297,11 @@ private:
 
     // this is the replacement of DoLogNumberOfRepeats() (which has to be kept
     // to avoid breaking ABI in this version)
-    unsigned LogLastRepetitionCountIfNeeded();
+    unsigned LogLastRepeatIfNeeded();
+
+    // implementation of the function above which supposes that the caller had
+    // already locked gs_prevCS
+    unsigned LogLastRepeatIfNeededUnlocked();
 };
 
 // ----------------------------------------------------------------------------

src/common/log.cpp

@@ -287,13 +287,18 @@ wxCRIT_SECT_DECLARE(gs_prevCS);
 unsigned wxLog::DoLogNumberOfRepeats()
 {
     wxLog * const pLogger = GetActiveTarget();
-    return pLogger ? pLogger->LogLastRepetitionCountIfNeeded() : 0u;
+    return pLogger ? pLogger->LogLastRepeatIfNeeded() : 0u;
 }
 
-unsigned wxLog::LogLastRepetitionCountIfNeeded()
+unsigned wxLog::LogLastRepeatIfNeeded()
 {
     wxCRIT_SECT_LOCKER(lock, gs_prevCS);
 
+    return LogLastRepeatIfNeededUnlocked();
+}
+
+unsigned wxLog::LogLastRepeatIfNeededUnlocked()
+{
     long retval = ms_prevCounter;
     if ( ms_prevCounter > 0 )
     {
@@ -315,7 +320,7 @@ unsigned wxLog::LogLastRepetitionCountIfNeeded()
 
 wxLog::~wxLog()
 {
-    LogLastRepetitionCountIfNeeded();
+    LogLastRepeatIfNeeded();
 }
 
 /* static */
@@ -339,7 +344,7 @@ void wxLog::OnLog(wxLogLevel level, const wxChar *szString, time_t t)
                     return;
                 }
 
-                pLogger->LogLastRepetitionCountIfNeeded();
+                pLogger->LogLastRepeatIfNeededUnlocked();
 
                 // reset repetition counter for a new message
                 ms_prevString = szString;