# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1530186530 -10800
# Node ID b49814dd8469969ef16524790f664c947e9068ec
# Parent  0b2a2da4c7e7bdcf926f4bacc7875a93103373cf
Only copy memory blocks that do not already exist in destination.

diff -r 0b2a2da4c7e7 -r b49814dd8469 tools/gfxconv.c
--- a/tools/gfxconv.c	Thu Jun 28 14:47:54 2018 +0300
+++ b/tools/gfxconv.c	Thu Jun 28 14:48:50 2018 +0300
@@ -1142,9 +1142,14 @@
         dmMsg(1, "Upconverting multicolor to FLI.\n");
         for (int i = 0; i < dst->nbanks; i++)
         {
-            dmC64MemBlockCopy(&dst->color[i], &src->color[0]);
-            dmC64MemBlockCopy(&dst->screen[i], &src->screen[0]);
-            dmC64MemBlockCopy(&dst->bitmap[i], &src->bitmap[0]);
+            if (dst->color[i].data == NULL)
+                dmC64MemBlockCopy(&dst->color[i], &src->color[0]);
+
+            if (dst->screen[i].data == NULL)
+                dmC64MemBlockCopy(&dst->screen[i], &src->screen[0]);
+
+            if (dst->bitmap[i].data == NULL)
+                dmC64MemBlockCopy(&dst->bitmap[i], &src->bitmap[0]);
         }
     }
     else