If the supplied entry was a directory,
CreateAppMetaMimeThread::DoMimeUpdate() would always fail early, making recursive operation impossible. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25307 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
ca978b6ed8
commit
3a4c7e6e71
@ -49,6 +49,13 @@ CreateAppMetaMimeThread::DoMimeUpdate(const entry_ref* ref, bool* _entryIsDir)
|
|||||||
if (status < B_OK)
|
if (status < B_OK)
|
||||||
return status;
|
return status;
|
||||||
|
|
||||||
|
bool isDir = file.IsDirectory();
|
||||||
|
if (_entryIsDir != NULL)
|
||||||
|
*_entryIsDir = isDir;
|
||||||
|
|
||||||
|
if (isDir)
|
||||||
|
return B_OK;
|
||||||
|
|
||||||
BAppFileInfo appInfo(&file);
|
BAppFileInfo appInfo(&file);
|
||||||
status = appInfo.InitCheck();
|
status = appInfo.InitCheck();
|
||||||
if (status < B_OK)
|
if (status < B_OK)
|
||||||
@ -143,9 +150,6 @@ CreateAppMetaMimeThread::DoMimeUpdate(const entry_ref* ref, bool* _entryIsDir)
|
|||||||
status = mime.SetIconForType(type, &largeIcon, B_LARGE_ICON);
|
status = mime.SetIconForType(type, &largeIcon, B_LARGE_ICON);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (status == B_OK && _entryIsDir != NULL)
|
|
||||||
*_entryIsDir = file.IsDirectory();
|
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user