Browse Source

Merge pull request #15375 from volzhs/button-group

Remove button from button_group when free
Rémi Verschelde 7 years ago
parent
commit
8e8240450e
1 changed files with 3 additions and 3 deletions
  1. 3 3
      scene/gui/base_button.cpp

+ 3 - 3
scene/gui/base_button.cpp

@@ -539,15 +539,15 @@ BaseButton::BaseButton() {
 	set_focus_mode(FOCUS_ALL);
 	set_focus_mode(FOCUS_ALL);
 	enabled_focus_mode = FOCUS_ALL;
 	enabled_focus_mode = FOCUS_ALL;
 	action_mode = ACTION_MODE_BUTTON_RELEASE;
 	action_mode = ACTION_MODE_BUTTON_RELEASE;
+}
+
+BaseButton::~BaseButton() {
 
 
 	if (button_group.is_valid()) {
 	if (button_group.is_valid()) {
 		button_group->buttons.erase(this);
 		button_group->buttons.erase(this);
 	}
 	}
 }
 }
 
 
-BaseButton::~BaseButton() {
-}
-
 void ButtonGroup::get_buttons(List<BaseButton *> *r_buttons) {
 void ButtonGroup::get_buttons(List<BaseButton *> *r_buttons) {
 
 
 	for (Set<BaseButton *>::Element *E = buttons.front(); E; E = E->next()) {
 	for (Set<BaseButton *>::Element *E = buttons.front(); E; E = E->next()) {