diff --git a/plugins/GSdx/GSDialog.cpp b/plugins/GSdx/GSDialog.cpp index 7c55d67570..1c1f46a751 100644 --- a/plugins/GSdx/GSDialog.cpp +++ b/plugins/GSdx/GSDialog.cpp @@ -166,10 +166,17 @@ void GSDialog::SetTextAsInt(UINT id, int i) void GSDialog::ComboBoxInit(UINT id, const vector& settings, int32_t selectionValue, int32_t maxValue) { + if (settings.empty()) + return; + HWND hWnd = GetDlgItem(m_hWnd, id); SendMessage(hWnd, CB_RESETCONTENT, 0, 0); + const auto is_present = [=](const GSSetting& x) { return selectionValue == x.value; }; + if (std::none_of(settings.begin(), settings.end(), is_present)) + selectionValue = settings.front().value; + for(size_t i = 0; i < settings.size(); i++) { const GSSetting& s = settings[i];