From acbe38b01fb20fb580f8bc74f40ead1c7d4e77ec Mon Sep 17 00:00:00 2001 From: Matt Mascarenhas Date: Sat, 6 Jan 2018 00:00:05 +0000 Subject: [PATCH] cinera.c: Fix 0.5.20 more correctly The actual bug was that MarkerIndex wasn't being incremented for HMML_CATEGORY markers mid-annotation... (HMML_MEMBER and HMML_PROJECT were fine.) --- cinera/cinera.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/cinera/cinera.c b/cinera/cinera.c index 8d29b19..ce68434 100644 --- a/cinera/cinera.c +++ b/cinera/cinera.c @@ -14,7 +14,7 @@ typedef struct version CINERA_APP_VERSION = { .Major = 0, .Minor = 5, - .Patch = 20 + .Patch = 21 }; // TODO(matt): Copy in the DB 3 stuff from cinera_working.c @@ -2594,6 +2594,7 @@ HMMLToBuffers(buffers *CollationBuffers, template **BespokeTemplate, char *Filen HasFilterMenu = TRUE; } InsertCategory(&Topics, &LocalTopics, &Media, &LocalMedia, Anno->markers[MarkerIndex].marker); + ++MarkerIndex; } } @@ -2843,24 +2844,21 @@ AppendedIdentifier: while(MarkerIndex < Anno->marker_count) { - if(Anno->markers[MarkerIndex].type == HMML_CATEGORY) + switch(GenerateTopicColours(Anno->markers[MarkerIndex].marker)) { - switch(GenerateTopicColours(Anno->markers[MarkerIndex].marker)) - { - case RC_SUCCESS: - case RC_NOOP: - break; - case RC_ERROR_FILE: - case RC_ERROR_MEMORY: - hmml_free(&HMML); - return RC_ERROR_FATAL; - }; - if(!HasFilterMenu) - { - HasFilterMenu = TRUE; - } - InsertCategory(&Topics, &LocalTopics, &Media, &LocalMedia, Anno->markers[MarkerIndex].marker); + case RC_SUCCESS: + case RC_NOOP: + break; + case RC_ERROR_FILE: + case RC_ERROR_MEMORY: + hmml_free(&HMML); + return RC_ERROR_FATAL; + }; + if(!HasFilterMenu) + { + HasFilterMenu = TRUE; } + InsertCategory(&Topics, &LocalTopics, &Media, &LocalMedia, Anno->markers[MarkerIndex].marker); ++MarkerIndex; }