diff --git a/obs/forms/OBSWindows.cpp b/obs/forms/OBSWindows.cpp
index 24d4a1b9af414f3db07f1459a5f194cf7753ddd9..fd3379de98223a6fc9a18eef29c8fe9ac3769e1e 100644
--- a/obs/forms/OBSWindows.cpp
+++ b/obs/forms/OBSWindows.cpp
@@ -442,11 +442,9 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
bSizer32->Add( 0, 20, 0, wxEXPAND, 5 );
- generalChangedText = new wxStaticText( generalPanel, wxID_ANY, _("Settings.RestartProgram"), wxDefaultPosition, wxDefaultSize, 0 );
- generalChangedText->Wrap( -1 );
- generalChangedText->Hide();
-
- bSizer32->Add( generalChangedText, 1, wxALL|wxEXPAND, 5 );
+ generalText = new wxStaticText( generalPanel, wxID_ANY, _("Settings.RestartProgram"), wxDefaultPosition, wxDefaultSize, 0 );
+ generalText->Wrap( -1 );
+ bSizer32->Add( generalText, 1, wxALL|wxEXPAND, 5 );
generalPanel->SetSizer( bSizer32 );
@@ -698,6 +696,7 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
this->Centre( wxBOTH );
// Connect Events
+ this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( OBSBasicSettingsBase::OnClose ) );
settingsList->Connect( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, wxListbookEventHandler( OBSBasicSettingsBase::PageChanged ), NULL, this );
settingsList->Connect( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, wxListbookEventHandler( OBSBasicSettingsBase::PageChanging ), NULL, this );
}
@@ -705,6 +704,7 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
OBSBasicSettingsBase::~OBSBasicSettingsBase()
{
// Disconnect Events
+ this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( OBSBasicSettingsBase::OnClose ) );
settingsList->Disconnect( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, wxListbookEventHandler( OBSBasicSettingsBase::PageChanged ), NULL, this );
settingsList->Disconnect( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, wxListbookEventHandler( OBSBasicSettingsBase::PageChanging ), NULL, this );
diff --git a/obs/forms/OBSWindows.fbp b/obs/forms/OBSWindows.fbp
index bd3122d5cf1889c9b5a2187753270712cdcff330..121744b254ba2ca68f19cd1c37076aa6371b6af4 100644
--- a/obs/forms/OBSWindows.fbp
+++ b/obs/forms/OBSWindows.fbp
@@ -2727,7 +2727,7 @@
-
+ OnClose
@@ -3175,7 +3175,7 @@
1
0
- 1
+ 0
wxID_ANY
Settings.RestartProgram
@@ -3185,11 +3185,11 @@
0
1
- generalChangedText
+ generalText
1
- protected
+ public
1
Resizable
diff --git a/obs/forms/OBSWindows.h b/obs/forms/OBSWindows.h
index 55b80058f4bacd98d4e2b9445e262d6fb9bb26e7..6c0434b40da5588f3eba8e75eaf6937cfb8bcf91 100644
--- a/obs/forms/OBSWindows.h
+++ b/obs/forms/OBSWindows.h
@@ -196,7 +196,6 @@ class OBSBasicSettingsBase : public DialogSubclass
protected:
wxListbook* settingsList;
wxStaticText* m_staticText27;
- wxStaticText* generalChangedText;
wxPanel* videoPanel;
wxStaticText* m_staticText6;
wxStaticText* m_staticText8;
@@ -222,6 +221,7 @@ class OBSBasicSettingsBase : public DialogSubclass
wxButton* applyButton;
// Virtual event handlers, overide them in your derived class
+ virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
virtual void PageChanged( wxListbookEvent& event ) { event.Skip(); }
virtual void PageChanging( wxListbookEvent& event ) { event.Skip(); }
@@ -229,6 +229,7 @@ class OBSBasicSettingsBase : public DialogSubclass
public:
wxPanel* generalPanel;
wxComboBox* languageList;
+ wxStaticText* generalText;
wxPanel* outputsPanel;
wxComboBox* videoAdapterList;
wxComboBox* baseResList;