ShareX
/
ShareX
mirror of https://github.com/ShareX/ShareX.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#7329: SingleInstanceManager improvements

This commit is contained in:
Jaex 2024-03-28 05:10:04 +03:00
parent ee958d8708
commit 038b270070
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ShareX.HelpersLib/SingleInstanceManager.cs
View File

@ -97,13 +97,17 @@ namespace ShareX.HelpersLib
{
while (!cts.IsCancellationRequested)
{
bool namedPipeServerCreated = false;
try
{
using (NamedPipeServerStream serverPipe = new NamedPipeServerStream(PipeName, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, PipeOptions.Asynchronous))
using (NamedPipeServerStream namedPipeServer = new NamedPipeServerStream(PipeName, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, PipeOptions.Asynchronous))
{
await serverPipe.WaitForConnectionAsync(cts.Token).ConfigureAwait(false);
namedPipeServerCreated = true;
using (BinaryReader reader = new BinaryReader(serverPipe, Encoding.UTF8))
await namedPipeServer.WaitForConnectionAsync(cts.Token).ConfigureAwait(false);
using (BinaryReader reader = new BinaryReader(namedPipeServer, Encoding.UTF8))
{
int length = reader.ReadInt32();
@ -123,18 +127,17 @@ namespace ShareX.HelpersLib
}
}
}
catch when (cts.IsCancellationRequested)
catch (OperationCanceledException)
{
}
catch (UnauthorizedAccessException e)
{
DebugHelper.WriteException(e);
break;
}
catch (Exception e)
{
DebugHelper.WriteException(e);
if (!namedPipeServerCreated)
{
break;
}
}
}
}
@ -143,11 +146,11 @@ namespace ShareX.HelpersLib
{
try
{
using (NamedPipeClientStream clientPipe = new NamedPipeClientStream(".", PipeName, PipeDirection.Out))
using (NamedPipeClientStream namedPipeClient = new NamedPipeClientStream(".", PipeName, PipeDirection.Out))
{
clientPipe.Connect(ConnectTimeout);
namedPipeClient.Connect(ConnectTimeout);
using (BinaryWriter writer = new BinaryWriter(clientPipe, Encoding.UTF8))
using (BinaryWriter writer = new BinaryWriter(namedPipeClient, Encoding.UTF8))
{
writer.Write(args.Length);