X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmsg_renderers.c;h=cc594541379e48b5135079a6aa62864746c3db00;hb=718dc4e139c40ca1b58d3e6e6956ed24bda49612;hp=b0a1fde1ca279144f45a470c06fdbe4aa12c99d3;hpb=76c0720efccba7b7dd73fcedec39386f7c0c4b54;p=citadel.git

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index b0a1fde1c..cc5945413 100644
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -1106,11 +1106,11 @@ long DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg, int nMes
 	long ret;
 	long hklen;
 	const char *key;
-	int done = 0;
 	int nItems;
 	HashPos *At;
 	long vector[16];
 	WCTemplputParams SubTP;
+	int wantmore = 1;
 
 	memset(&SubTP, 0, sizeof(WCTemplputParams));
 	SubTP.Filter.ContextType = CTX_LONGVECTOR;
@@ -1125,9 +1125,14 @@ long DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg, int nMes
 	vector[3] = 0;
 	vector[7] = starting_from;
 
-	while (!done) {
+	while (wantmore)
+	{
+	
 		vector[3] = abs(nMessages);
 		lo = GetHashPosCounter(WCC->summ, At);
+		wantmore = GetNextHashPos(WCC->summ, At, &hklen, &key, &vMsg);
+		if (!wantmore)
+			break;
 		if (nMessages > 0) {
 			if (lo + nMessages >= nItems) {
 				hi = nItems - 1;
@@ -1155,7 +1160,6 @@ long DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg, int nMes
 					hi = lo + nMessages;
 			}
 		}
-		done = !GetNextHashPos(WCC->summ, At, &hklen, &key, &vMsg);
 		
 		/*
 		 * Bump these because although we're thinking in zero base, the user