CodeMirror/SystemTrayMenu
1
0
Fork 0
mirror of https://github.com/Hofknecht/SystemTrayMenu.git synced 2024-06-02 18:44:56 +12:00
Code Issues Projects Releases Wiki Activity

Fix for closing pipe upon application shutdown.

Browse source
This commit is contained in:
Peter Kirmeier 2023-06-03 21:15:13 +02:00
parent 0e812d207b
commit 2b408c83bf
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Business/IpcPipe.cs
View file

@ -23,6 +23,7 @@ namespace SystemTrayMenu.Business
private NamedPipeServerStream? serverPipe;
private Thread? serverThread;
private Func<string, string>? serverHandler;
private ManualResetEvent? cancelEvent;
private bool isStopped;
internal IpcPipe(byte version, string name)
@ -34,14 +35,16 @@ namespace SystemTrayMenu.Business
public void Dispose()
{
isStopped = true;
serverPipe?.Disconnect();
cancelEvent?.Set();
serverThread?.Join(250);
serverPipe?.Dispose();
cancelEvent?.Dispose();
serverThread = null;
}
internal void StartServer(Func<string, string> handler)
{
cancelEvent = new(false);
serverHandler = handler;
serverThread = new(ServerThread);
@ -85,7 +88,16 @@ namespace SystemTrayMenu.Business
NamedPipeServerStream pipe = ipc.serverPipe = new(ipc.pipeName);
try
{
pipe.WaitForConnection();
// Stupid workaround for WaitForConnection as it will not unblock when pipe gets closed or disposed.
// See: https://stackoverflow.com/questions/607872/what-is-a-good-way-to-shutdown-threads-blocked-on-namedpipeserverwaitforconnect
ManualResetEvent connectEvent = new (false);
pipe.BeginWaitForConnection(ar => { connectEvent.Set(); }, null);
if (WaitHandle.WaitAny(new WaitHandle[] { connectEvent, ipc.cancelEvent! }) == 1)
{
ipc.serverPipe = null;
pipe.Dispose();
return;
}
IpcPipeStream stream = new(pipe);

2
UserInterface/SettingsWindow.xaml
View file

@ -119,7 +119,7 @@
<StackPanel>
<CheckBox x:Name="checkBoxResolveLinksToFolders" Content="{u:Translate 'Resolve links to folders and show content'}"/>
<CheckBox x:Name="checkBoxShowInTaskbar" Content="{u:Translate 'Show in Taskbar'}"/>
<CheckBox x:Name="checkBoxSendHotkeyInsteadKillOtherInstances" Content="{u:Translate 'Send hotkey to other instance'}"/>
<CheckBox x:Name="checkBoxSendHotkeyInsteadKillOtherInstances" Content="{u:Translate 'Send hotkey to other instance'}"/> <!-- TODO: It will use named pipes instead of hotkey! -->
<CheckBox x:Name="checkBoxSupportGamepad" Content="{u:Translate 'Support Gamepad'}"/>
</StackPanel>
</GroupBox>