diff --git a/obs/forms/OBSWindows.cpp b/obs/forms/OBSWindows.cpp
index 402bae8c27ec2c08bf014df770a70fd1d333212e..b94c215cc082c369d06631e3703c4e474e6cae2c 100644
--- a/obs/forms/OBSWindows.cpp
+++ b/obs/forms/OBSWindows.cpp
@@ -556,15 +556,16 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
wxBoxSizer* bSizer45;
bSizer45 = new wxBoxSizer( wxHORIZONTAL );
- fpsCommonList = new wxComboBox( m_panel13, ID_FPS_COMMON, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY );
+ fpsCommonList = new wxComboBox( m_panel13, ID_FPS_COMMON, _("30"), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY );
fpsCommonList->Append( _("10") );
fpsCommonList->Append( _("20") );
+ fpsCommonList->Append( _("25") );
fpsCommonList->Append( _("29.97") );
fpsCommonList->Append( _("30") );
fpsCommonList->Append( _("48") );
fpsCommonList->Append( _("59.94") );
fpsCommonList->Append( _("60") );
- fpsCommonList->SetSelection( 3 );
+ fpsCommonList->SetSelection( 4 );
bSizer45->Add( fpsCommonList, 0, wxTOP|wxBOTTOM|wxRIGHT, 2 );
diff --git a/obs/forms/OBSWindows.fbp b/obs/forms/OBSWindows.fbp
index f9f0434d1d7ddc679a30277e4f3bf1e067076f1b..66dc2947fba89ed44f0e330beae8f1d61812ff4a 100644
--- a/obs/forms/OBSWindows.fbp
+++ b/obs/forms/OBSWindows.fbp
@@ -4929,7 +4929,7 @@
1
0
- "10" "20" "29.97" "30" "48" "59.94" "60"
+ "10" "20" "25" "29.97" "30" "48" "59.94" "60"
1
1
@@ -4959,7 +4959,7 @@
1
Resizable
- 3
+ 4
1
wxCB_READONLY
@@ -4970,7 +4970,7 @@
wxFILTER_NONE
wxDefaultValidator
-
+ 30
diff --git a/obs/obs-app.cpp b/obs/obs-app.cpp
index 60cbaa416b87d5bec198b9a1f8ed5f36819dad10..f69b0b8ad05873fde2e94072d8146a999b1ff60e 100644
--- a/obs/obs-app.cpp
+++ b/obs/obs-app.cpp
@@ -227,6 +227,9 @@ void OBSApp::GetFPSCommon(uint32_t &num, uint32_t &den) const
} else if (strcmp(val, "20") == 0) {
num = 20;
den = 1;
+ } else if (strcmp(val, "25") == 0) {
+ num = 25;
+ den = 1;
} else if (strcmp(val, "29.97") == 0) {
num = 30000;
den = 1001;
diff --git a/obs/settings-basic-video.cpp b/obs/settings-basic-video.cpp
index 88a1448c75fd90e7b79f160711dfc901befe6116..4a11678d57a2b39f0dec390e4c3f2544282280d0 100644
--- a/obs/settings-basic-video.cpp
+++ b/obs/settings-basic-video.cpp
@@ -196,26 +196,13 @@ void BasicVideoData::LoadFPSData()
void BasicVideoData::LoadFPSCommon()
{
- const char *str = config_get_string(GetGlobalConfig(), "Video",
+ const char *val = config_get_string(GetGlobalConfig(), "Video",
"FPSCommon");
- int val = 3;
- if (strcmp(str, "10") == 0)
- val = 0;
- else if (strcmp(str, "20") == 0)
- val = 1;
- else if (strcmp(str, "29.97") == 0)
- val = 2;
- else if (strcmp(str, "30") == 0)
- val = 3;
- else if (strcmp(str, "48") == 0)
- val = 4;
- else if (strcmp(str, "59.94") == 0)
- val = 5;
- else if (strcmp(str, "60") == 0)
- val = 6;
-
- window->fpsCommonList->SetSelection(val);
+ int sel = window->fpsCommonList->FindString(val);
+ if (sel == wxNOT_FOUND)
+ sel = window->fpsCommonList->FindString("30");
+ window->fpsCommonList->SetSelection(sel);
}
void BasicVideoData::LoadFPSInteger()