Merge pull request #85 from microsoft/user/ryanbod/fix_catastrophic_failure

Fixing xaml catastrophic failure,
This commit is contained in:
ryanbodrug-microsoft
2020-04-09 09:40:31 -07:00
committed by GitHub

View File

@@ -18,10 +18,12 @@ using Stopwatch = Wox.Infrastructure.Stopwatch;
namespace PowerLauncher
{
public partial class App : IDisposable, ISingleInstanceApp
{
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 Settings _settings;
private MainViewModel _mainVM;
@@ -34,10 +36,13 @@ namespace PowerLauncher
{
if (SingleInstance<App>.InitializeAsFirstInstance(Unique))
{
using (var application = new App())
using (new UI.App())
{
application.InitializeComponent();
application.Run();
using (var application = new App())
{
application.InitializeComponent();
application.Run();
}
}
}
}