Skip to content

Fix issue that mainVM fails to work #3296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix issue that mainVM fails to work #3296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Flow.Launcher/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
await imageLoadertask;

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

Log.Info($"|App.OnStartup|Dependencies Info:{ErrorReporting.DependenciesInfo()}");
Expand Down
13 changes: 9 additions & 4 deletions Flow.Launcher/PublicAPIInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,23 @@ namespace Flow.Launcher
public class PublicAPIInstance : IPublicAPI
{
private readonly Settings _settings;
private readonly MainViewModel _mainVM;
private MainViewModel _mainVM;

#region Constructor
#region Constructor & Initialization

public PublicAPIInstance(Settings settings, MainViewModel mainVM)
public PublicAPIInstance(Settings settings)
{
_settings = settings;
_mainVM = mainVM;
GlobalHotkey.hookedKeyboardCallback = KListener_hookedKeyboardCallback;
WebRequest.RegisterPrefix("data", new DataWebRequestFactory());
}

// We must initialize mainVM later to avoid unknown issue that _mainVM fails to work
public void Initialize(MainViewModel mainVM)
{
_mainVM = mainVM;
}

#endregion

#region Public API
Expand Down
Loading