(svn r26629) -Fix [FS#6012]: If the video driver fails to supply a list of resolutions, display an error message.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 5cac72223..ccc8ff8e6 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -268,6 +268,8 @@ struct GameOptionsWindow : Window {
 			}
 
 			case WID_GO_RESOLUTION_DROPDOWN: // Setup resolution dropdown
+				if (_num_resolutions == 0) break;
+
 				list = new DropDownList();
 				*selected_index = GetCurRes();
 				for (int i = 0; i < _num_resolutions; i++) {
@@ -433,6 +435,8 @@ struct GameOptionsWindow : Window {
 				DropDownList *list = this->BuildDropDownList(widget, &selected);
 				if (list != NULL) {
 					ShowDropDownList(this, list, selected, widget);
+				} else {
+					if (widget == WID_GO_RESOLUTION_DROPDOWN) ShowErrorMessage(STR_ERROR_RESOLUTION_LIST_FAILED, INVALID_STRING_ID, WL_ERROR);
 				}
 				break;
 			}