From e791096b81d0ed6ef0ba8f07567b1c8aa0deb406 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Fri, 2 Dec 2011 14:07:55 +0100 Subject: [PATCH] Fix unintentional change that broke input_server in safemode. The change to this initial index for safemode was brought in with the flat import of the package manager branch in 323b654 where presumably more paths were used. With this value selecting either just safe mode or disable user add-ons would lead to no input_server add-ons being loaded at all, leading to a system without input. --- src/servers/input/AddOnManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/servers/input/AddOnManager.cpp b/src/servers/input/AddOnManager.cpp index f7e477ed24..0d75e6a942 100644 --- a/src/servers/input/AddOnManager.cpp +++ b/src/servers/input/AddOnManager.cpp @@ -276,7 +276,7 @@ AddOnManager::_RegisterAddOns() BDirectory directory; BPath path; // when safemode, only B_SYSTEM_ADDONS_DIRECTORY is used - for (uint32 i = fSafeMode ? 4 : 0; + for (uint32 i = fSafeMode ? 2 : 0; i < sizeof(directories) / sizeof(directory_which); i++) { for (int32 j = 0; j < subDirectoryCount; j++) { if (find_directory(directories[i], &path) == B_OK