Merge pull request #15375 from volzhs/button-group

Remove button from button_group when free
godotengine · Jan 5, 2018 · 8e82404 · 8e82404
2 parents 061db1c + 13af5e8
commit 8e82404
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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()) {