diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2022-11-02 12:20:05 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2022-11-02 12:20:05 -0400 |
| commit | 7b35b7baea861ae58cd01826bb57fe995dc8aa52 (patch) | |
| tree | d73198b7a3f55a3644f8b0faf60a0283d5a81f17 /indra/llui/llfloater.cpp | |
| parent | 13456d01a71b873ed59e3839f817434357fc8da5 (diff) | |
| parent | 15b5dedb2dc139c85461e7c867164b65cc6fc628 (diff) | |
DRTVWR-575: Merge branch 'master' into fix-monterey
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index c6a3ada777..d413fab270 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -762,17 +762,13 @@ void LLFloater::closeFloater(bool app_quitting) for(handle_set_iter_t dependent_it = mDependents.begin(); dependent_it != mDependents.end(); ) { - LLFloater* floaterp = dependent_it->get(); - if (floaterp) - { - ++dependent_it; - floaterp->closeFloater(app_quitting); - } - else - { - mDependents.erase(dependent_it++); - } + dependent_it = mDependents.erase(dependent_it); + if (floaterp) + { + floaterp->mDependeeHandle = LLHandle<LLFloater>(); + floaterp->closeFloater(app_quitting); + } } cleanupHandles(); @@ -1443,7 +1439,7 @@ void LLFloater::cleanupHandles() LLFloater* floaterp = dependent_it->get(); if (!floaterp) { - mDependents.erase(dependent_it++); + dependent_it = mDependents.erase(dependent_it); } else { |