RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pgui: Fix crash when PGEntry removes itself w/ background focus 

Fixes #1650
This commit is contained in:
rdb 2024-10-24 16:41:56 +02:00
parent aa0462a35a
commit d758d2b232
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
panda/src/pgui/pgItem.cxx
View File

@ -784,9 +784,14 @@ move(const MouseWatcherParameter &param) {
*/
void PGItem::
background_press(const MouseWatcherParameter &param) {
for (PGItem *item : _background_focus) {
// We have to be careful, because objects may remove themselves from the set
// while we're iterating over it.
auto it = _background_focus.begin();
while (it != _background_focus.end()) {
PGItem *item = *it++;
if (!item->get_focus()) {
item->press(param, true);
PT(PGItem) item_ref(item);
item_ref->press(param, true);
}
}
}
@ -796,9 +801,12 @@ background_press(const MouseWatcherParameter &param) {
*/
void PGItem::
background_release(const MouseWatcherParameter &param) {
for (PGItem *item : _background_focus) {
auto it = _background_focus.begin();
while (it != _background_focus.end()) {
PGItem *item = *it++;
if (!item->get_focus()) {
item->release(param, true);
PT(PGItem) item_ref(item);
item_ref->release(param, true);
}
}
}
@ -808,9 +816,12 @@ background_release(const MouseWatcherParameter &param) {
*/
void PGItem::
background_keystroke(const MouseWatcherParameter &param) {
for (PGItem *item : _background_focus) {
auto it = _background_focus.begin();
while (it != _background_focus.end()) {
PGItem *item = *it++;
if (!item->get_focus()) {
item->keystroke(param, true);
PT(PGItem) item_ref(item);
item_ref->keystroke(param, true);
}
}
}
@ -820,9 +831,12 @@ background_keystroke(const MouseWatcherParameter &param) {
*/
void PGItem::
background_candidate(const MouseWatcherParameter &param) {
for (PGItem *item : _background_focus) {
auto it = _background_focus.begin();
while (it != _background_focus.end()) {
PGItem *item = *it++;
if (!item->get_focus()) {
item->candidate(param, true);
PT(PGItem) item_ref(item);
item_ref->candidate(param, true);
}
}
}