[haiku-commits] haiku: hrev46181 - src/servers/app/font
- From: anevilyak@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 6 Oct 2013 17:18:39 +0200 (CEST)
hrev46181 adds 1 changeset to branch 'master'
old head: 897d5af7ff716051d07775bc8d8ad3f894d20e37
new head: 1db2f863d8484f151ea8e5debd18f35d2a2f99a4
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=1db2f86+%5E897d5af
----------------------------------------------------------------------------
1db2f86: Fix #10045.
- app_server's FontManager also needs to watch ~/config/non-packaged/fonts.
[ Rene Gollent <rene@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46181
Commit: 1db2f863d8484f151ea8e5debd18f35d2a2f99a4
URL: http://cgit.haiku-os.org/haiku/commit/?id=1db2f86
Author: Rene Gollent <rene@xxxxxxxxxxx>
Date: Sun Oct 6 15:01:18 2013 UTC
Ticket: https://dev.haiku-os.org/ticket/10045
----------------------------------------------------------------------------
1 file changed, 6 insertions(+), 4 deletions(-)
src/servers/app/font/FontManager.cpp | 10 ++++++----
----------------------------------------------------------------------------
diff --git a/src/servers/app/font/FontManager.cpp
b/src/servers/app/font/FontManager.cpp
index c13b83f..1817668 100644
--- a/src/servers/app/font/FontManager.cpp
+++ b/src/servers/app/font/FontManager.cpp
@@ -1145,10 +1145,12 @@ FontManager::AttachUser(uid_t userID)
// TODO: actually, find_directory() cannot know which user ID we want
here
// TODO: avoids user fonts in safe mode
BPath path;
- if (find_directory(B_USER_FONTS_DIRECTORY, &path, true) != B_OK)
- return;
-
- _AddPath(path.Path());
+ if (find_directory(B_USER_FONTS_DIRECTORY, &path, true) == B_OK)
+ _AddPath(path.Path());
+ if (find_directory(B_USER_NONPACKAGED_FONTS_DIRECTORY, &path, true)
+ == B_OK) {
+ _AddPath(path.Path());
+ }
#endif
}
Other related posts:
- » [haiku-commits] haiku: hrev46181 - src/servers/app/font - anevilyak
