[haiku-commits] haiku: hrev46243 - in src/servers: media_addon index
- From: stpere@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 17 Oct 2013 01:53:14 +0200 (CEST)
hrev46243 adds 1 changeset to branch 'master'
old head: ced0e0be044a482503d4f9d37e9db1b0af77143f
new head: b29295c7da798d28c38edce001dabb4f50789972
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=b29295c+%5Eced0e0b
----------------------------------------------------------------------------
b29295c: Fix loading add-ons in safemode
Signed-off-by: Philippe Saint-Pierre <stpere@xxxxxxxxx>
[ Murai Takashi <tmurai01@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46243
Commit: b29295c7da798d28c38edce001dabb4f50789972
URL: http://cgit.haiku-os.org/haiku/commit/?id=b29295c
Author: Murai Takashi <tmurai01@xxxxxxxxx>
Date: Sun Oct 6 11:55:38 2013 UTC
Committer: Philippe Saint-Pierre <stpere@xxxxxxxxx>
Commit-Date: Wed Oct 16 23:51:34 2013 UTC
----------------------------------------------------------------------------
2 files changed, 2 insertions(+), 2 deletions(-)
src/servers/index/IndexServer.cpp | 2 +-
src/servers/media_addon/MediaAddonServer.cpp | 2 +-
----------------------------------------------------------------------------
diff --git a/src/servers/index/IndexServer.cpp
b/src/servers/index/IndexServer.cpp
index 7c55910..515e999 100644
--- a/src/servers/index/IndexServer.cpp
+++ b/src/servers/index/IndexServer.cpp
@@ -339,7 +339,7 @@ IndexServer::_StartWatchingAddOns()
};
// when safemode, only B_SYSTEM_ADDONS_DIRECTORY is used
- for (uint32 i = safeMode ? 4 : 0;
+ for (uint32 i = safeMode ? 3 : 0;
i < sizeof(directories) / sizeof(directory_which); i++)
{
BDirectory directory;
node_ref nodeRef;
diff --git a/src/servers/media_addon/MediaAddonServer.cpp
b/src/servers/media_addon/MediaAddonServer.cpp
index 1b380d4..2b7f6e6 100644
--- a/src/servers/media_addon/MediaAddonServer.cpp
+++ b/src/servers/media_addon/MediaAddonServer.cpp
@@ -301,7 +301,7 @@ MediaAddonServer::ReadyToRun()
};
// when safemode, only B_SYSTEM_ADDONS_DIRECTORY is used
- for (uint32 i = safeMode ? 4 : 0;
+ for (uint32 i = safeMode ? 3 : 0;
i < sizeof(directories) / sizeof(directory_which); i++)
{
BDirectory directory;
node_ref nodeRef;
Other related posts:
- » [haiku-commits] haiku: hrev46243 - in src/servers: media_addon index - stpere
