Consitent end of file line endings for merge and split tools

2020-05-30 13:17:21 +02:00
parent bee82dd735
commit ee5cdc1d41
2 changed files with 2 additions and 1 deletions
@@ -106,7 +106,7 @@ class GuiDocMerge(QDialog):
        theDoc = NWDoc(self.theProject, self.theParent)
        theText = ""
        for tHandle in finalOrder:
-            theText += theDoc.openDocument(tHandle, False).rstrip()
+            theText += theDoc.openDocument(tHandle, False).rstrip("\n")
            theText += "\n\n"

        if self.sourceItem is None:
@@ -182,6 +182,7 @@ class GuiDocSplit(QDialog):
            )

            theText = "\n".join(theLines[iStart:iEnd])
+            theText = theText.rstrip("\n") + "\n\n"
            theDoc.openDocument(nHandle, False)
            theDoc.saveDocument(theText)
            theDoc.clearDocument()