fix focus after dismissing settings dialog

This commit is contained in:
Palana 2013-12-16 16:06:30 +01:00
parent 8c19ad4b14
commit 9ac6f646b6
2 changed files with 6 additions and 3 deletions

View File

@ -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)

View File

@ -52,5 +52,8 @@ void OBSBasicSettings::PageChanging(wxListbookEvent &event)
void OBSBasicSettings::OnClose(wxCloseEvent &event)
{
Destroy();
if(IsModal())
EndModal(0);
else
Destroy();
}