Merge pull request #15 from littlepig/master

Fixed a crash on the game due to trying to change resolution on Mac
2011-09-14 02:34:52 -07:00 · 2011-09-14 02:34:52 -07:00 · 006263776f
parent d74a73a34d d2076a7c6e
commit 006263776f
1 changed files with 7 additions and 0 deletions
--- a/src/frontend.cpp
+++ b/src/frontend.cpp
@ -918,6 +918,13 @@ bool runVideoOptionsMenu(void)
 					current = 0;
 			}

+			// We can't pick resolutions if there are any.
+			if (modes.isEmpty())
+			{
+				debug(LOG_ERROR,"No resolutions available to change.");
+				break;
+			}
+
 			// Set the new width and height (takes effect on restart)
 			war_SetWidth(modes[current].width());
 			war_SetHeight(modes[current].height());