Skip to content

Commit d6c24cb

Browse files
committed
Don't show register page when aborting
1 parent eff6bbd commit d6c24cb

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Signal-Windows.Lib/SignalLibHandle.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -942,7 +942,7 @@ private void InitNetwork()
942942
{
943943
Logger.LogTrace("InitNetwork() sync context = {0}", SynchronizationContext.Current);
944944
MessageReceiver = new SignalServiceMessageReceiver(LibUtils.ServiceConfiguration, new StaticCredentialsProvider(Store.Username, Store.Password, Store.SignalingKey, (int)Store.DeviceId), LibUtils.USER_AGENT);
945-
var pipeTask = Task.Run(async () =>
945+
Task.Run(async () =>
946946
{
947947
try
948948
{
@@ -951,9 +951,12 @@ private void InitNetwork()
951951
IncomingMessagesTask = Task.Run(() => new IncomingMessages(CancelSource.Token, pipe, MessageReceiver).HandleIncomingMessages());
952952
Logger.LogTrace("Starting OutgoingMessagesTask");
953953
OutgoingMessagesTask = Task.Run(() => new OutgoingMessages(CancelSource.Token, pipe, Store, this).HandleOutgoingMessages());
954-
return pipe;
955954
}
956-
catch(Exception e)
955+
catch (OperationCanceledException)
956+
{
957+
Logger.LogInformation("InitNetwork cancelled");
958+
}
959+
catch (Exception e)
957960
{
958961
Logger.LogError("InitNetwork failed: {0}\n{1}", e.Message, e.StackTrace);
959962
await HandleAuthFailure();

0 commit comments

Comments
 (0)