fix a bug in peekmessage

[lcore.git] / lmessages.pas

diff --git a/lmessages.pas b/lmessages.pas
index 3aafdca70b52e0287a725a50fa36f4cd371502a3..e17ccfe933b99e52adb663cc84b269efe28236ea 100755 (executable)
--- a/lmessages.pas
+++ b/lmessages.pas
@@ -409,11 +409,11 @@ begin
       //we have to get the window procedure while the structurelock\r
       //is still held as the window could be destroyed from another thread\r
       //otherwise.\r
       //we have to get the window procedure while the structurelock\r
       //is still held as the window could be destroyed from another thread\r
       //otherwise.\r

-      if window <> nil then begin
+      if window <> nil then begin\r

         windowproc := window.windowproc;\r
         windowproc := window.windowproc;\r

-      end else begin
-        windowproc := nil;
-      end;
+      end else begin\r
+        windowproc := nil;\r
+      end;\r

     finally\r
       structurelock.release;\r
     end;\r
     finally\r
       structurelock.release;\r
     end;\r


@@ -494,7 +494,7 @@ end;
 \r
 function PeekMessage(var lpMsg: TMsg; hWnd: HWND; wMsgFilterMin, wMsgFilterMax, wRemoveMsg: UINT): WINBOOL;\r
 begin\r
 \r
 function PeekMessage(var lpMsg: TMsg; hWnd: HWND; wMsgFilterMin, wMsgFilterMax, wRemoveMsg: UINT): WINBOOL;\r
 begin\r

-  result := getmessageinternal(lpmsg,hwnd,wmsgfiltermin,wmsgfiltermax,PM_REMOVE,true);\r
+  result := getmessageinternal(lpmsg,hwnd,wmsgfiltermin,wmsgfiltermax,wRemoveMsg,true);\r

 end;\r
 \r
 function SetEvent(hEvent:THevent):WINBOOL;\r
 end;\r
 \r
 function SetEvent(hEvent:THevent):WINBOOL;\r