浏览代码

fix focus after dismissing settings dialog

Palana 12 年之前
父节点
当前提交
9ac6f646b6
共有 2 个文件被更改,包括 6 次插入3 次删除
  1. 2 2
      obs/window-main-basic.cpp
  2. 4 1
      obs/window-settings-basic.cpp

+ 2 - 2
obs/window-main-basic.cpp

@@ -119,8 +119,8 @@ void OBSBasic::sourceDownClicked(wxCommandEvent &event)
 
 
 void OBSBasic::settingsClicked(wxCommandEvent &event)
 void OBSBasic::settingsClicked(wxCommandEvent &event)
 {
 {
-	OBSBasicSettings *test = new OBSBasicSettings(this);
-	test->ShowModal();
+	OBSBasicSettings test(this);
+	test.ShowModal();
 }
 }
 
 
 void OBSBasic::exitClicked(wxCommandEvent &event)
 void OBSBasic::exitClicked(wxCommandEvent &event)

+ 4 - 1
obs/window-settings-basic.cpp

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