changeset 1747:fb8c0c724a18

Fix marker handling.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 18 Oct 2017 15:41:44 +0300
parents 892d444fca65
children 1b00969757d9
files colormap.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/colormap.c	Wed Oct 18 15:11:28 2017 +0300
+++ b/colormap.c	Wed Oct 18 15:41:44 2017 +0300
@@ -411,7 +411,6 @@
 
             // Location marker mode
             checkEndTag(outFile, fmt, prevColor);
-            currColor = prevColor = -2;
 
             // Get location marker tag
             if (!getTagStr(inFile, tmpStr, MAXSTR, 0xfc))
@@ -432,6 +431,8 @@
                 fmt->putTagMarker(outFile, tmpStr, currColor, mch);
             else
                 fprintf(outFile, "%c", mch);
+
+            currColor = prevColor = -2;
         }
         else
         if (k == 0xff)
@@ -441,7 +442,6 @@
 
             // Location title mode
             checkEndTag(outFile, fmt, prevColor);
-            currColor = prevColor = -2;
 
             // Get location marker tag
             if (!getTagStr(inFile, tmpStr, MAXSTR, 0xfc))
@@ -475,6 +475,8 @@
 
             if (fmt->putTagLocationEnd)
                 fmt->putTagLocationEnd(outFile, tmpStr);
+
+            currColor = prevColor = -2;
         }
         else
         {