Merge branch 'main' into super-cut

This commit is contained in:
Maurice Parker
2023-04-16 14:13:06 -05:00
73 changed files with 195 additions and 319 deletions

View File

@@ -86,11 +86,15 @@ final class ArticleThemesManager: NSObject, NSFilePresenter, Logging {
}
func presentedSubitemDidChange(at url: URL) {
themeNames = buildThemeNames()
do {
currentTheme = try articleThemeWithThemeName(currentThemeName)
} catch {
appDelegate.presentThemeImportError(error)
if url.lastPathComponent.localizedCaseInsensitiveContains("nnwtheme") {
themeNames = buildThemeNames()
do {
currentTheme = try articleThemeWithThemeName(currentThemeName)
} catch {
Task { @MainActor in
appDelegate.presentThemeImportError(error)
}
}
}
}