[sword-svn] r3281 - in branches/sword-1-7-x: . src/keys

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2014-12-02 23:07:22 -0700 (Tue, 02 Dec 2014)
New Revision: 3281

Modified:
   branches/sword-1-7-x/
   branches/sword-1-7-x/src/keys/versekey.cpp
Log:
Merged r3239



Property changes on: branches/sword-1-7-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:2989-2991,2997,3001-3004,3006,3010-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3135,3140,3144,3151,3153-3155,3190-3192,3198-3199,3202-3203,3225,3230,3232-3234,3236,3238
   + /trunk:2989-2991,2997,3001-3004,3006,3010-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3135,3140,3144,3151,3153-3155,3190-3192,3198-3199,3202-3203,3225,3230,3232-3234,3236,3238-3239

Modified: branches/sword-1-7-x/src/keys/versekey.cpp
===================================================================
--- branches/sword-1-7-x/src/keys/versekey.cpp	2014-12-03 06:03:47 UTC (rev 3280)
+++ branches/sword-1-7-x/src/keys/versekey.cpp	2014-12-03 06:07:22 UTC (rev 3281)
@@ -157,7 +157,9 @@
 	}
 	else {
 		SWKey::positionFrom(*fromKey);
-		parse();
+// extraneous parse which inadvertently clears error flag
+// SWKey::positionFrom already calls copyFrom which calls setText, which VerseKey::setText already calls parse()
+//		parse();
 	}
 
  	// should we always perform bounds checks?  Tried but seems to cause infinite recursion
@@ -212,7 +214,9 @@
 	}
 	else {
 		SWKey::copyFrom(*fromKey);
-		parse();
+// extraneous parse which inadvertently clears error flag
+// SWKey::copyFrom already calls setText, which VerseKey::setText already calls parse()
+//		parse();
 	}
 }