Fixed: cdCanvasKillCanvas for the CD_IMAGE and CD_DBUFFER drivers of the Cairo base driver.

3 files changed, 4 insertions, 0 deletions

diff --git a/html/en/history.html b/html/en/history.html
index 117262b..2accf04 100644
--- a/html/en/history.html
+++ b/html/en/history.html
@@ -33,6 +33,8 @@
 	and <strong>cdContextType</strong>.</li>
 	<li><span class="hist_fixed">Fixed:</span> defines in Cairo so it can be 
 	compiled using older Cairo and Pango versions.</li>
+	<li><span class="hist_fixed">Fixed:</span> <strong>cdCanvasKillCanvas</strong> 
+	for the CD_IMAGE and CD_DBUFFER drivers of the Cairo base driver.</li>
 </ul>
 <h3><a href="http://sourceforge.net/projects/canvasdraw/files/5.4.1/">Version 
 5.4.1</a> (09/Nov/2010)</h3>
diff --git a/src/cairo/cdcairodbuf.c b/src/cairo/cdcairodbuf.c
index 0322191..9c00863 100644
--- a/src/cairo/cdcairodbuf.c
+++ b/src/cairo/cdcairodbuf.c
@@ -13,6 +13,7 @@
 static void cdkillcanvas (cdCtxCanvas* ctxcanvas)
 {
   cdKillImage(ctxcanvas->image_dbuffer);
+  ctxcanvas->cr = NULL; /* avoid to destroy it twice */
   cdcairoKillCanvas(ctxcanvas);
 }
 
diff --git a/src/cairo/cdcairoimg.c b/src/cairo/cdcairoimg.c
index 77bbda8..7311f20 100644
--- a/src/cairo/cdcairoimg.c
+++ b/src/cairo/cdcairoimg.c
@@ -12,6 +12,7 @@
 
 static void cdkillcanvas(cdCtxCanvas* ctxcanvas)
 {
+  ctxcanvas->cr = NULL; /* avoid to destroy it twice */
   cdcairoKillCanvas(ctxcanvas);
 }