fixed infinite recursion bug in some rare cases

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

docs/changes.txt

@@ -175,14 +175,15 @@ OTHER CHANGES
 2.4.2
 -----
 
-wxBase:
-
-- always NUL-terminate the log messages
-
 All:
 
+- always NUL-terminate the log messages
 - wxRegEx::Compile() now calculates the number of groups correctly
 
+All (GUI):
+
+- rare crash in wxFontMapper fixed (Robert Vazan)
+
 Generic:
 
 - wxListCtrl: respect wxLC_NO_HEADER style when inserting first column

src/common/fontmap.cpp

@@ -758,13 +758,15 @@ bool wxFontMapper::TestAltEncoding(const wxString& configEntry,
 class ReentrancyBlocker
 {
 public:
-    ReentrancyBlocker(bool& b) : m_b(b) { m_b = TRUE; }
+    ReentrancyBlocker(bool& flag) : m_flagOld(flag), m_flag(flag)
-    ~ReentrancyBlocker() { m_b = FALSE; }
+        { m_flag = TRUE; }
+    ~ReentrancyBlocker() { m_flag = m_flagOld; }
 
 private:
-    bool& m_b;
+    bool m_flagOld;
+    bool& m_flag;
 };
-#endif
+#endif // wxUSE_GUI
 
 bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
                                      wxNativeEncodingInfo *info,