mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-09 04:37:30 +02:00
Merge pull request #85 from microsoft/user/ryanbod/fix_catastrophic_failure
Fixing xaml catastrophic failure,
This commit is contained in:
@@ -18,10 +18,12 @@ using Stopwatch = Wox.Infrastructure.Stopwatch;
|
|||||||
|
|
||||||
namespace PowerLauncher
|
namespace PowerLauncher
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
public partial class App : IDisposable, ISingleInstanceApp
|
public partial class App : IDisposable, ISingleInstanceApp
|
||||||
{
|
{
|
||||||
public static PublicAPIInstance API { get; private set; }
|
public static PublicAPIInstance API { get; private set; }
|
||||||
private const string Unique = "Wox_Unique_Application_Mutex";
|
private const string Unique = "PowerLauncher_Unique_Application_Mutex";
|
||||||
private static bool _disposed;
|
private static bool _disposed;
|
||||||
private Settings _settings;
|
private Settings _settings;
|
||||||
private MainViewModel _mainVM;
|
private MainViewModel _mainVM;
|
||||||
@@ -34,10 +36,13 @@ namespace PowerLauncher
|
|||||||
{
|
{
|
||||||
if (SingleInstance<App>.InitializeAsFirstInstance(Unique))
|
if (SingleInstance<App>.InitializeAsFirstInstance(Unique))
|
||||||
{
|
{
|
||||||
using (var application = new App())
|
using (new UI.App())
|
||||||
{
|
{
|
||||||
application.InitializeComponent();
|
using (var application = new App())
|
||||||
application.Run();
|
{
|
||||||
|
application.InitializeComponent();
|
||||||
|
application.Run();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user