Skip to content

Commit 2fae06d

Browse files
authored
Merge branch 'dev' into 240518Adjusthemes
2 parents 4865ae3 + 53c937e commit 2fae06d

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

Flow.Launcher.Core/Plugin/ProcessStreamPluginV2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ public override async Task ReloadDataAsync()
8282

8383
public override async ValueTask DisposeAsync()
8484
{
85+
await base.DisposeAsync();
8586
ClientProcess.Kill(true);
8687
await ClientProcess.WaitForExitAsync();
8788
ClientProcess.Dispose();
88-
await base.DisposeAsync();
8989
}
9090
}
9191
}

Flow.Launcher/Flow.Launcher.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>WinExe</OutputType>
55
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
66
<UseWPF>true</UseWPF>
7-
<UseWindowsForms>true</UseWindowsForms>
7+
<UseWindowsForms>false</UseWindowsForms>
88
<StartupObject>Flow.Launcher.App</StartupObject>
99
<ApplicationIcon>Resources\app.ico</ApplicationIcon>
1010
<ApplicationManifest>app.manifest</ApplicationManifest>

Flow.Launcher/Images/app_error.png

-13.2 KB
Loading

Flow.Launcher/app.manifest

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,12 @@
4949
DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
5050
to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
5151
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
52-
<!--
5352
<application xmlns="urn:schemas-microsoft-com:asm.v3">
5453
<windowsSettings>
5554
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
55+
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
5656
</windowsSettings>
5757
</application>
58-
-->
5958

6059
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
6160
<dependency>

0 commit comments

Comments
 (0)