Browse Source

fcl-web: TCustomWSServer.RemoveConnection: call DoDisconnect on disconnect

mattias 3 years ago
parent
commit
87857252a4
1 changed files with 2 additions and 3 deletions
  1. 2 3
      packages/fcl-web/src/websocket/fpcustwsserver.pp

+ 2 - 3
packages/fcl-web/src/websocket/fpcustwsserver.pp

@@ -592,15 +592,14 @@ end;
 
 
 procedure TCustomWSServer.RemoveConnection(AConnection: TWSServerConnection;aDoDisconnect: Boolean);
 procedure TCustomWSServer.RemoveConnection(AConnection: TWSServerConnection;aDoDisconnect: Boolean);
 begin
 begin
-  if not aDoDisconnect then
-    DoDisconnect(aConnection)
-  else
+  if aDoDisconnect then
     try
     try
       aConnection.Disconnect;
       aConnection.Disconnect;
     except
     except
       on E : Exception do
       on E : Exception do
        HandleError(aConnection,E);
        HandleError(aConnection,E);
     end;
     end;
+  DoDisconnect(aConnection);
   Connections.Remove(aConnection);
   Connections.Remove(aConnection);
   aConnection.Free;
   aConnection.Free;
 end;
 end;