Skip to content

Commit 2e516a9

Browse files
committed
Fix issue that mainVM fails to work
1 parent 65f85cf commit 2e516a9

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

Flow.Launcher/App.xaml.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
135135
await imageLoadertask;
136136

137137
var mainVM = Ioc.Default.GetRequiredService<MainViewModel>();
138+
((PublicAPIInstance)API).Initialize(mainVM);
138139
var window = new MainWindow(_settings, mainVM);
139140

140141
Log.Info($"|App.OnStartup|Dependencies Info:{ErrorReporting.DependenciesInfo()}");

Flow.Launcher/PublicAPIInstance.cs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,23 @@ namespace Flow.Launcher
3434
public class PublicAPIInstance : IPublicAPI
3535
{
3636
private readonly Settings _settings;
37-
private readonly MainViewModel _mainVM;
37+
private MainViewModel _mainVM;
3838

39-
#region Constructor
39+
#region Constructor & Initialization
4040

41-
public PublicAPIInstance(Settings settings, MainViewModel mainVM)
41+
public PublicAPIInstance(Settings settings)
4242
{
4343
_settings = settings;
44-
_mainVM = mainVM;
4544
GlobalHotkey.hookedKeyboardCallback = KListener_hookedKeyboardCallback;
4645
WebRequest.RegisterPrefix("data", new DataWebRequestFactory());
4746
}
4847

48+
// We must initialize mainVM later to avoid unknown issue that _mainVM fails to work
49+
public void Initialize(MainViewModel mainVM)
50+
{
51+
_mainVM = mainVM;
52+
}
53+
4954
#endregion
5055

5156
#region Public API

0 commit comments

Comments
 (0)