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

Tracker: Fix regression introduced in hrev49011.

Browse Source 
If the view fails to lock because it is actually gone, we obviously
can't use it to return the container, so delete it directly in that
case.

Fixes #12072 and probably #11982 which would then be a duplicate.
This commit is contained in:
Michael Lotz 2015-08-10 21:27:50 +02:00
parent 1379e2b328
commit 7cef8ca2fe
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/kits/tracker/PoseView.cpp
View File

@ -1433,11 +1433,14 @@ BPoseView::AddPosesTask(void* castToParams)
if (!view->IsValidAddPosesThread(threadID)) {
// this handles the case of a file panel when the directory is
// switched and and old AddPosesTask needs to die.
// switched and an old AddPosesTask needs to die.
// we might no longer be the current async thread
// for this view - if not then we're done
view->HideBarberPole();
view->ReturnDirentIterator(container);
container = NULL;
// for now use the same cleanup as failToLock does
posesResult->fCount = modelChunkIndex + 1;
throw failToLock();
@ -1511,8 +1514,7 @@ BPoseView::AddPosesTask(void* castToParams)
PRINT(("add_poses cleanup \n"));
// failed to lock window, bail
delete posesResult;
view->ReturnDirentIterator(container);
delete container;
return B_ERROR;
}
@ -1521,10 +1523,11 @@ BPoseView::AddPosesTask(void* castToParams)
delete posesResult;
view->ReturnDirentIterator(container);
if (lock.Lock())
if (lock.Lock()) {
view->ReturnDirentIterator(container);
view->fAddPosesThreads.erase(threadID);
} else
delete container;
return B_OK;
}