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

HaikuDepot: Quitting while contents were populated dead-locked.

Browse Source 
Fixes #11737
This commit is contained in:
Stephan Aßmus 2015-01-11 16:24:13 +01:00
parent a15d13d9bb
commit fed7859a71
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/apps/haikudepot/ui/PackageContentsView.cpp
View File

@ -125,7 +125,7 @@ public:
// entry->Parent() != NULL ? entry->Parent()->Name() : "NULL",
// entry->Name());
if (!fListView->LockLooper())
if (fListView->LockLooperWithTimeout(1000000) != B_OK)
return B_ERROR;
// Check if we are still supposed to popuplate the list
@ -342,7 +342,7 @@ PackageContentsView::_ContentPopulatorThread(void* arg)
if (package.Get() != NULL) {
if (!view->_PopuplatePackageContens(*package.Get())) {
if (view->LockLooper()) {
if (view->LockLooperWithTimeout(1000000) == B_OK) {
view->fContentListView->AddItem(
new BStringItem(B_TRANSLATE("<Package contents not "
"available for remote packages>")));
@ -403,10 +403,11 @@ PackageContentsView::_PopuplatePackageContens(const PackageInfo& package)
fPackageLock, fPackage);
status = reader.ParseContent(&contentHandler);
if (status != B_OK) {
printf("PackageContentsView::SetPackage(): "
printf("PackageContentsView::_PopuplatePackageContens(): "
"failed parse package contents: %s\n", strerror(status));
// NOTE: Do not return false, since it taken to mean this
// is a remote package.
// is a remote package, but is it not, we simply want to stop
// populating the contents early.
}
return true;
}