fixed infinite recursion bug in some rare cases

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

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index e81d145d65cccd4a29e215361ef4e3a8f6a4eefd..b546c191519f2028b34da864166ca13e2e0dfeb9 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -760,13 +760,15 @@ bool wxFontMapper::TestAltEncoding(const wxString& configEntry,
 class ReentrancyBlocker
 {
 public:
 class ReentrancyBlocker
 {
 public:

-    ReentrancyBlocker(bool& b) : m_b(b) { m_b = TRUE; }
-    ~ReentrancyBlocker() { m_b = FALSE; }
+    ReentrancyBlocker(bool& flag) : m_flagOld(flag), m_flag(flag)
+        { m_flag = TRUE; }
+    ~ReentrancyBlocker() { m_flag = m_flagOld; }

 
 private:
 
 private:

-    bool& m_b;
+    bool m_flagOld;
+    bool& m_flag;

 };
 };

-#endif
+#endif // wxUSE_GUI

 
 bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
                                      wxNativeEncodingInfo *info,
 
 bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
                                      wxNativeEncodingInfo *info,