From 63f0ff25fc38e5acc6c1a27a038c6ff5ac37225f Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 14 Feb 2009 01:42:12 +0000 Subject: (svn r15476) -Fix [FS#2630]: crash when opening the game options when the currently loaded base graphics pack has less than 2 valid graphics files. For example when someone replaces all his/her original base graphics with custom work (but keeps the name) or renames the dos ones to windows or vice versa. --- src/gfxinit.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp index 549ad77e4..c6b725514 100644 --- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -577,7 +577,7 @@ int GetNumGraphicsSets() { int n = 0; for (const GraphicsSet *g = _available_graphics_sets; g != NULL; g = g->next) { - if (g->found_grfs <= 1) continue; + if (g != _used_graphics_set && g->found_grfs <= 1) continue; n++; } return n; @@ -590,8 +590,8 @@ int GetIndexOfCurrentGraphicsSet() { int n = 0; for (const GraphicsSet *g = _available_graphics_sets; g != NULL; g = g->next) { - if (g->found_grfs <= 1) continue; if (g == _used_graphics_set) return n; + if (g->found_grfs <= 1) continue; n++; } return -1; @@ -603,7 +603,7 @@ int GetIndexOfCurrentGraphicsSet() const char *GetGraphicsSetName(int index) { for (const GraphicsSet *g = _available_graphics_sets; g != NULL; g = g->next) { - if (g->found_grfs <= 1) continue; + if (g != _used_graphics_set && g->found_grfs <= 1) continue; if (index == 0) return g->name; index--; } -- cgit v1.2.3-54-g00ecf