client `Disconnect ` method blocking issue in 2.6.x

hello, I use nuget pkg 2.5.x in a wpf prism project,worked well. however when I upgarded to 2.6.x to the latest 2.6.x version.the client Disconnect method seems to blocking main thread.so I wonder if there were some changes in logic in the new version.

2.6 client code via dnspy

public void Disconnect()
{
	if (this.IsConnected)
	{
		Action<string> logger = this.Logger;
		if (logger != null)
		{
			logger(this._header + "disconnecting from " + this.ServerIpPort);
		}
		this._tokenSource.Cancel();
		this._dataReceiver.Wait();
		this._client.Close();
		this._isConnected = false;
		return;
	}
	Action<string> logger2 = this.Logger;
	if (logger2 == null)
	{
		return;
	}
	logger2(this._header + "already disconnected");
}

2.5.4 client code via dnspy

public void Disconnect()
{
	if (this.IsConnected)
	{
		Action<string> logger = this.Logger;
		if (logger != null)
		{
			logger(this._Header + "disconnecting from " + this.ServerIpPort);
		}
		this._TokenSource.Cancel();
		this._TokenSource.Token.WaitHandle.WaitOne();
		this._Client.Close();
		this._IsConnected = false;
		return;
	}
	Action<string> logger2 = this.Logger;
	if (logger2 == null)
	{
		return;
	}
	logger2(this._Header + "already disconnected");
}

[jchristn]

Ah, yes, winforms 😃 it gets tricky with winforms. I’m not an expert, but I have experienced interaction with objects blocking the main thread in a forms app. Probably best to have it in a background task.

[czyt]

Hi, yes, the issue with 2.5 was that Disconnect would return prior to the cancellation actually happening, so if you attempt to Start again, it would fail (in glorious fashion). The .Wait() was added to the DataReceiver task to make sure it had actually terminated prior to allowing Disconnect to return. If you want, you can always fire an unawaited task in your code to do this, i.e. Task.Run(() => client.Disconnect());

thanks for your reply!