summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2021-10-28 12:41:38 +0300
committerJaakko Keränen <jaakko.keranen@iki.fi>2021-10-28 12:41:38 +0300
commit99fdc7b912272bb4aaa565da2003d36d7c233b81 (patch)
tree00c86339473d19a8db160ccff7235492bbea16f4 /src
parent3a58ca94b59aa867f46cbfe30d5bd85eb9f986de (diff)
FontPack: Only load "default" from the resource file
Diffstat (limited to 'src')
-rw-r--r--src/fontpack.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/fontpack.c b/src/fontpack.c
index 9ebb09b1..96d973f7 100644
--- a/src/fontpack.c
+++ b/src/fontpack.c
@@ -558,6 +558,9 @@ void init_Fonts(const char *userDir) {
558 const iString *dir = collect_String(concatCStr_Path(execDir, locations[i])); 558 const iString *dir = collect_String(concatCStr_Path(execDir, locations[i]));
559 iForEach(DirFileInfo, entry, iClob(new_DirFileInfo(dir))) { 559 iForEach(DirFileInfo, entry, iClob(new_DirFileInfo(dir))) {
560 const iString *entryPath = path_FileInfo(entry.value); 560 const iString *entryPath = path_FileInfo(entry.value);
561 if (equalCase_Rangecc(baseName_Path(entryPath), "default.fontpack")) {
562 continue; /* The default pack only comes from resources.lgr. */
563 }
561 if (endsWithCase_String(entryPath, ".fontpack")) { 564 if (endsWithCase_String(entryPath, ".fontpack")) {
562 iArchive *arch = new_Archive(); 565 iArchive *arch = new_Archive();
563 if (openFile_Archive(arch, entryPath)) { 566 if (openFile_Archive(arch, entryPath)) {