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

BRoster: Apply no-registrar mode in a few more cases.

Browse Source 
Avoids some more attempts at communicating with the registrar if the
no-registrar flag has been set.
This commit is contained in:
Michael Lotz 2015-08-26 21:33:41 +02:00
parent ae9cbf9c4e
commit ee5575d9b3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/kits/app/Roster.cpp
View File

@ -2068,7 +2068,7 @@ BRoster::_ResolveApp(const char* inType, entry_ref* ref,
}
// create meta mime
if (error == B_OK) {
if (!fNoRegistrar && error == B_OK) {
BPath path;
if (path.SetTo(&appRef) == B_OK)
create_app_meta_mime(path.Path(), false, true, false);
@ -2077,7 +2077,7 @@ BRoster::_ResolveApp(const char* inType, entry_ref* ref,
// set the app hint on the type -- but only if the file has the
// respective signature, otherwise unset the app hint
BAppFileInfo appFileInfo;
if (error == B_OK) {
if (!fNoRegistrar && error == B_OK) {
char signature[B_MIME_TYPE_LENGTH];
if (appFileInfo.SetTo(&appFile) == B_OK
&& appFileInfo.GetSignature(signature) == B_OK) {
@ -2482,6 +2482,9 @@ BRoster::_GetFileType(const entry_ref* file, BNodeInfo* nodeInfo,
if (nodeInfo->GetType(mimeType) == B_OK)
return B_OK;
if (fNoRegistrar)
return B_NO_INIT;
// Try to update the file's MIME info and just read the updated type.
// If that fails, sniff manually.
BPath path;