Skip to content

Remove old dictionaries references to fix possible memory leak #3990

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

Merged
merged 5 commits into from
Sep 19, 2025
Merged

Remove old dictionaries references to fix possible memory leak #3990

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b05c2c1
Remove old dictionaries references to fix possible memory leak
Jack251970 Sep 18, 2025
6c695f0
Use clear function
Jack251970 Sep 18, 2025
330e6c0
Add language change lock
Jack251970 Sep 18, 2025
86581e6
Add disposable for internalization
Jack251970 Sep 18, 2025
0f6245a
Handle exceptions inside ChangeLanguageAsync to avoid unobserved task…
Jack251970 Sep 18, 2025
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
33 changes: 22 additions & 11 deletions Flow.Launcher.Core/Resource/Internationalization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
Expand Down Expand Up @@ -30,6 +30,7 @@ public class Internationalization
private readonly List<string> _languageDirectories = [];
private readonly List<ResourceDictionary> _oldResources = [];
private static string SystemLanguageCode;
private readonly SemaphoreSlim _langChangeLock = new(1, 1);

public Internationalization(Settings settings)
{
Expand Down Expand Up @@ -185,20 +186,29 @@ private static Language GetLanguageByLanguageCode(string languageCode)

private async Task ChangeLanguageAsync(Language language, bool updateMetadata = true)
{
// Remove old language files and load language
RemoveOldLanguageFiles();
if (language != AvailableLanguages.English)
await _langChangeLock.WaitAsync();

try
{
LoadLanguage(language);
}
// Remove old language files and load language
RemoveOldLanguageFiles();
if (language != AvailableLanguages.English)
{
LoadLanguage(language);
}

// Change culture info
ChangeCultureInfo(language.LanguageCode);
// Change culture info
ChangeCultureInfo(language.LanguageCode);

if (updateMetadata)
if (updateMetadata)
{
// Raise event for plugins after culture is set
await Task.Run(UpdatePluginMetadataTranslations);
}
}
finally
{
// Raise event for plugins after culture is set
await Task.Run(UpdatePluginMetadataTranslations);
_langChangeLock.Release();
}
}

Expand Down Expand Up @@ -257,6 +267,7 @@ private void RemoveOldLanguageFiles()
{
dicts.Remove(r);
}
_oldResources.Clear();
}

private void LoadLanguage(Language language)
Expand Down
Loading