Skip to content

Fix hang when theme thumbnail cannot be generated #699

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

Open
rmbakker88 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix hang when theme thumbnail cannot be generated #699

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
131 changes: 79 additions & 52 deletions src/ThemeDialogUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,66 +52,82 @@ internal static string[] GetDisplayNames()

internal static void LoadThemes(List<ThemeConfig> themes, ListView listView, ThemeLoadOpts opts)
{
loadSemaphore.Wait(60000);
Size thumbnailSize = ThemeThumbLoader.GetThumbnailSize(listView);
ListViewItem focusedItem = null;
bool semaphoreAcquired = loadSemaphore.Wait(60000);

foreach (ThemeConfig theme in themes.ToList())
try
{
if (JsonConfig.settings.showInstalledOnly && !ThemeManager.IsThemeDownloaded(theme))
{
continue;
}
Size thumbnailSize = ThemeThumbLoader.GetThumbnailSize(listView);
ListViewItem focusedItem = null;

try
foreach (ThemeConfig theme in themes.ToList())
{
using (Image thumbnailImage = ThemeThumbLoader.GetThumbnailImage(theme, thumbnailSize, true))
if (JsonConfig.settings.showInstalledOnly && !ThemeManager.IsThemeDownloaded(theme))
{
listView.Invoke(new Action(() =>
{
listView.LargeImageList.Images.Add(thumbnailImage);
string itemText = ThemeManager.GetThemeName(theme);
if (JsonConfig.settings.favoriteThemes != null &&
JsonConfig.settings.favoriteThemes.Contains(theme.themeId))
{
itemText = "★ " + itemText;
}
ListViewItem newItem = listView.Items.Add(itemText,
listView.LargeImageList.Images.Count - 1);
newItem.Tag = theme.themeId;
continue;
}

if (opts.activeTheme != null && opts.activeTheme == theme.themeId)
{
newItem.Font = new Font(newItem.Font, FontStyle.Bold);
}
if (opts.focusTheme == null || opts.focusTheme == theme.themeId)
try
{
using (Image thumbnailImage = ThemeThumbLoader.GetThumbnailImage(theme, thumbnailSize, true))
{
listView.Invoke(new Action(() =>
{
focusedItem = newItem;
}
}));
listView.LargeImageList.Images.Add(thumbnailImage);
string itemText = ThemeManager.GetThemeName(theme);
if (JsonConfig.settings.favoriteThemes != null &&
JsonConfig.settings.favoriteThemes.Contains(theme.themeId))
{
itemText = "★ " + itemText;
}
ListViewItem newItem = listView.Items.Add(itemText,
listView.LargeImageList.Images.Count - 1);
newItem.Tag = theme.themeId;

if (opts.activeTheme != null && opts.activeTheme == theme.themeId)
{
newItem.Font = new Font(newItem.Font, FontStyle.Bold);
}
if (opts.focusTheme == null || opts.focusTheme == theme.themeId)
{
focusedItem = newItem;
}
}));
}
}
catch (Exception exc)
{
// Image formats that cannot be decoded throw ArgumentException or ExternalException, so
// catching only OutOfMemoryException here used to let the exception escape and leave the
// import dialog waiting for thumbnails forever
LoggingHandler.LogMessage("Failed to generate thumbnail for '{0}' theme: {1}", theme.themeId,
exc);
listView.Invoke(new Action(() =>
ThemeLoader.HandleError(new FailedToCreateThumbnail(theme.themeId))));
}
}
catch (OutOfMemoryException)

listView.Invoke(new Action(() =>
{
ThemeLoader.HandleError(new FailedToCreateThumbnail(theme.themeId));
}
}
listView.Sort();

listView.Invoke(new Action(() =>
{
listView.Sort();
if (focusedItem == null)
{
focusedItem = listView.Items[0];
}

focusedItem.Selected = true;
listView.EnsureVisible(focusedItem.Index);

if (focusedItem == null)
ThemeThumbLoader.CacheThumbnails(listView);
}));
}
finally
{
if (semaphoreAcquired)
{
focusedItem = listView.Items[0];
loadSemaphore.Release();
}

focusedItem.Selected = true;
listView.EnsureVisible(focusedItem.Index);

ThemeThumbLoader.CacheThumbnails(listView);
}));
loadSemaphore.Release();
}
}

internal static void LoadImportedThemes(List<ThemeConfig> themes, ListView listView, ImportDialog importDialog)
Expand All @@ -133,13 +149,24 @@ internal static void LoadImportedThemes(List<ThemeConfig> themes, ListView listV

Task.Run(() =>
{
LoadThemes(themes, listView, new ThemeLoadOpts());

importDialog.Invoke(new Action(() =>
try
{
importDialog.thumbnailsLoaded = true;
importDialog.Close();
}));
LoadThemes(themes, listView, new ThemeLoadOpts());
}
catch (Exception exc)
{
LoggingHandler.LogMessage("Failed to load imported themes: {0}", exc);
}
finally
{
// Closing the dialog here rather than after LoadThemes ensures the import always finishes, even
// if generating thumbnails failed
importDialog.Invoke(new Action(() =>
{
importDialog.thumbnailsLoaded = true;
importDialog.Close();
}));
}
});
}

Expand Down