accept lasterror must be obtained before the rmasterset

[lcore.git] / lsocket.pas

diff --git a/lsocket.pas b/lsocket.pas
index 4596f6b938129c268b9481200bfd15b20accf3ba..f359a55521de4b5f51802fba6033d865b85a069c 100644 (file)
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -534,7 +534,7 @@ function tlsocket.accept : longint;
 var\r
   FromAddrSize     : LongInt;        // i don't really know what to do with these at this\r
   FromAddr         : TInetSockAddrV;  // at this point time will tell :)\r
-  a:integer;\r
+  a,acceptlasterror:integer;\r
 begin\r
   {$ifdef secondlistener}\r
   if (lastsessionfromsecond) then begin\r
@@ -550,11 +550,14 @@ begin
   {$else}\r
     result := system_accept(fdhandlein,fromaddr,fromaddrsize);\r
   {$endif}\r
+\r
+  if (result = -1) then acceptlasterror := {$ifdef mswindows}getlasterror{$else}socketerror{$endif} else acceptlasterror := 0;\r
+\r
   //now we have accepted one request start monitoring for more again\r
   eventcore.rmasterset(fdhandlein,true);\r
 \r
   if result = -1 then begin\r
-    raise esocketexception.create('error '+inttostr({$ifdef mswindows}getlasterror{$else}socketerror{$endif})+' while accepting');\r
+    raise esocketexception.create('error '+inttostr(acceptlasterror)+' while accepting');\r
   end;\r
   if result > absolutemaxs then begin\r
     myfdclose(result);\r