From 0096ce3333a0828ba3821301db0ee0fb98e671d9 Mon Sep 17 00:00:00 2001
From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Thu, 9 Feb 2012 12:51:25 +0100
Subject: [PATCH] Fix bug in WB combobox readout

The previous patch exposed a latent bug in the readout of the generic popup.
---
 winboard/wsettings.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/winboard/wsettings.c b/winboard/wsettings.c
index 10bb427..5098d54 100644
--- a/winboard/wsettings.c
+++ b/winboard/wsettings.c
@@ -387,7 +387,7 @@ GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
 		if(!success) break;
 		new = -1;
 		for(k=0; k<optionList[j].max; k++) {
-		    if(!strcmp(choices[k], newText)) new = k;
+		    if(choices[k] && !strcmp(choices[k], newText)) new = k;
 		}
 		if(!cps && new > 0) {
 		    if(*(char**)optionList[j].target) free(*(char**)optionList[j].target);
-- 
1.7.0.4