[ros-diffs] [gvg] 13721: tinus <o112w8r02@sneakemail.com>

[gvg at svn.reactos.com]

tinus <o112w8r02 at sneakemail.com>
Fix the caret timer warnings
Don't kill the timer unless we added it.
Modified: trunk/reactos/subsys/win32k/ntuser/caret.c
  _____  

Modified: trunk/reactos/subsys/win32k/ntuser/caret.c
--- trunk/reactos/subsys/win32k/ntuser/caret.c	2005-02-22 22:19:14 UTC
(rev 13720)
+++ trunk/reactos/subsys/win32k/ntuser/caret.c	2005-02-23 08:14:48 UTC
(rev 13721)
@@ -240,12 +240,14 @@

     return FALSE;
   }
   
-  IntKillTimer(hWnd, IDCARETTIMER, TRUE);
-  
   ThreadQueue = (PUSER_MESSAGE_QUEUE)PsGetWin32Thread()->MessageQueue;
+
+  if (ThreadQueue->CaretInfo->Visible)
+  {
+    IntKillTimer(hWnd, IDCARETTIMER, TRUE);
+    IntHideCaret(ThreadQueue->CaretInfo);
+  }
   
-  IntHideCaret(ThreadQueue->CaretInfo);
-  
   ThreadQueue->CaretInfo->hWnd = hWnd;
   if(hBitmap)
   {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20050223/225fb7a7/attachment.html