@@ -119,8 +119,8 @@ void OBSBasic::sourceDownClicked(wxCommandEvent &event)
void OBSBasic::settingsClicked(wxCommandEvent &event)
{
- OBSBasicSettings *test = new OBSBasicSettings(this);
- test->ShowModal();
+ OBSBasicSettings test(this);
+ test.ShowModal();
}
void OBSBasic::exitClicked(wxCommandEvent &event)
@@ -52,5 +52,8 @@ void OBSBasicSettings::PageChanging(wxListbookEvent &event)
void OBSBasicSettings::OnClose(wxCloseEvent &event)
- Destroy();
+ if(IsModal())
+ EndModal(0);
+ else
+ Destroy();