diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-05 23:20:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 23:20:19 +0100 |
| commit | 8e8240450edc48f4fb379e593a4ef7f54ab656b7 (patch) | |
| tree | 619e3a39662e677b188d71e929b18f2a10c4303a | |
| parent | 061db1ca95ff3476069a501cc96f14c479789c83 (diff) | |
| parent | 13af5e8878c58504eb892a8edc9b5cca965f76b8 (diff) | |
Merge pull request #15375 from volzhs/button-group
Remove button from button_group when free
| -rw-r--r-- | scene/gui/base_button.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp index 0f1681a24e..d765248cca 100644 --- a/scene/gui/base_button.cpp +++ b/scene/gui/base_button.cpp @@ -539,15 +539,15 @@ BaseButton::BaseButton() { set_focus_mode(FOCUS_ALL); enabled_focus_mode = FOCUS_ALL; action_mode = ACTION_MODE_BUTTON_RELEASE; +} + +BaseButton::~BaseButton() { if (button_group.is_valid()) { button_group->buttons.erase(this); } } -BaseButton::~BaseButton() { -} - void ButtonGroup::get_buttons(List<BaseButton *> *r_buttons) { for (Set<BaseButton *>::Element *E = buttons.front(); E; E = E->next()) { |