[sword-svn] r3177 - in branches/sword-1-7-x: . utilities

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2014-04-16 21:24:37 -0700 (Wed, 16 Apr 2014)
New Revision: 3177

Modified:
   branches/sword-1-7-x/
   branches/sword-1-7-x/utilities/osis2mod.cpp
Log:
Merging r3217 - MODTOOLS-1



Property changes on: branches/sword-1-7-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:2989-2991,2997,3001-3004,3006,3010-3013,3015-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
   + /trunk:2989-2991,2997,3001-3004,3006,3010-3013,3015-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

Modified: branches/sword-1-7-x/utilities/osis2mod.cpp
===================================================================
--- branches/sword-1-7-x/utilities/osis2mod.cpp	2014-04-17 04:22:36 UTC (rev 3176)
+++ branches/sword-1-7-x/utilities/osis2mod.cpp	2014-04-17 04:24:37 UTC (rev 3177)
@@ -528,8 +528,9 @@
 		// If the entry already exists, then append this entry to the text.
 		// This is for verses that are outside the chosen versification. They are appended to the prior verse.
 		// The space should not be needed if we retained verse tags.
-		SWBuf currentText = module->getRawEntry();
-		if (currentText.length()) {
+		if (module->hasEntry(&currentVerse)) {
+			module->flush();
+			SWBuf currentText = module->getRawEntry();
 			cout << "INFO(WRITE): Appending entry: " << currentVerse.getOSISRef() << ": " << activeVerseText << endl;
 			activeVerseText = currentText + " " + activeVerseText;
 		}