From 1db2f863d8484f151ea8e5debd18f35d2a2f99a4 Mon Sep 17 00:00:00 2001
From: Rene Gollent <rene@gollent.com>
Date: Sun, 6 Oct 2013 11:01:18 -0400
Subject: [PATCH] Fix #10045.

- app_server's FontManager also needs to watch ~/config/non-packaged/fonts.
---
 src/servers/app/font/FontManager.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/servers/app/font/FontManager.cpp b/src/servers/app/font/FontManager.cpp
index c13b83f924..18176681dc 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
 }