Skip to content

Commit 017cc5a

Browse files
authored
Merge pull request #3365 from Jack251970/result_update_issue
Fix Plugin Manager Issue
2 parents 839c26d + b75066f commit 017cc5a

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Flow.Launcher/App.xaml.cs

+6-2
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,15 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
127127

128128
AbstractPluginEnvironment.PreStartPluginExecutablePathUpdate(_settings);
129129

130+
PluginManager.LoadPlugins(_settings.PluginSettings);
131+
132+
// Register ResultsUpdated event after all plugins are loaded
133+
Ioc.Default.GetRequiredService<MainViewModel>().RegisterResultsUpdatedEvent();
134+
135+
// Change language after all plugins are initialized
130136
// TODO: Clean InternationalizationManager.Instance and InternationalizationManager.Instance.GetTranslation in future
131137
Ioc.Default.GetRequiredService<Internationalization>().ChangeLanguage(_settings.Language);
132138

133-
PluginManager.LoadPlugins(_settings.PluginSettings);
134-
135139
Http.Proxy = _settings.Proxy;
136140

137141
await PluginManager.InitializePluginsAsync();

Flow.Launcher/ViewModel/MainViewModel.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ public MainViewModel()
168168
};
169169

170170
RegisterViewUpdate();
171-
RegisterResultsUpdatedEvent();
172171
_ = RegisterClockAndDateUpdateAsync();
173172
}
174173

@@ -213,7 +212,7 @@ void continueAction(Task t)
213212
}
214213
}
215214

216-
private void RegisterResultsUpdatedEvent()
215+
public void RegisterResultsUpdatedEvent()
217216
{
218217
foreach (var pair in PluginManager.GetPluginsForInterface<IResultUpdated>())
219218
{

0 commit comments

Comments
 (0)