[sword-cvs] sword/src/keys listkey.cpp,1.19,1.20

sword at www.crosswire.org sword at www.crosswire.org
Sat May 8 14:04:44 MST 2004


Update of /cvs/core/sword/src/keys
In directory www:/tmp/cvs-serv25446/src/keys

Modified Files:
	listkey.cpp 
Log Message:
Fixed ListKey contains function and normalized Traversable method name


Index: listkey.cpp
===================================================================
RCS file: /cvs/core/sword/src/keys/listkey.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- listkey.cpp	31 Aug 2003 01:58:14 -0000	1.19
+++ listkey.cpp	8 May 2004 21:04:42 -0000	1.20
@@ -296,9 +296,15 @@
 	for (arraypos = 0; arraypos < arraycnt; arraypos++) {
 		SWKey *key = array[arraypos];
 		if (key) {
-			key->setText(ikey);
-			if (!key->Error())
-				break;
+			if (key->isTraversable()) {
+				key->setText(ikey);
+				if (!key->Error())
+					break;
+			}
+			else {
+				if (!strcmp(key->getText(), ikey))
+					break;
+			}
 		}
 	}
 	if (arraypos >= arraycnt) {




More information about the sword-cvs mailing list