Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed input server start fallback

Browse Source 
After failing to start the input server by signature, the fallback
didn't append the input server name to the servers directory returned by
find_directory().
This commit is contained in:
Ingo Weinhold 2011-06-19 23:55:14 +02:00
parent 16ca035b2b
commit d5df784299
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/servers/app/Desktop.cpp
View File

@ -2373,10 +2373,11 @@ Desktop::_LaunchInputServer()
// Could not load input_server by signature, try well-known location
BEntry entry;
BPath systemServersDir;
if (find_directory(B_SYSTEM_SERVERS_DIRECTORY, &systemServersDir) == B_OK)
entry.SetTo(systemServersDir.Path());
else
BPath inputServerPath;
if (find_directory(B_SYSTEM_SERVERS_DIRECTORY, &inputServerPath) == B_OK
&& inputServerPath.Append("input_server") == B_OK) {
entry.SetTo(inputServerPath.Path());
} else
entry.SetTo("/system/servers/input_server");
entry_ref ref;
status_t entryStatus = entry.GetRef(&ref);