From 24a21a5f1db94e67594b1dbd001e3696792d5d73 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 17 May 2009 09:58:14 +0000
Subject: [PATCH] do not overwrite ms_{hwnd,className} in
 wxTimerHiddenWindowModule::OnInit() in case they were already initialized

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/timer.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index a82534c492..e5e42f4a6a 100644
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -192,8 +192,10 @@ const wxChar *wxTimerHiddenWindowModule::ms_className = NULL;
 
 bool wxTimerHiddenWindowModule::OnInit()
 {
-    ms_hwnd = NULL;
-    ms_className = NULL;
+    // do not initialize ms_hwnd to ms_className to NULL here: it may happen
+    // that our GetHWND() is called before the modules are initialized if a
+    // timer is created from wxApp-derived class ctor and in this case we
+    // shouldn't overwrite it
 
     return true;
 }
-- 
2.50.0