--- a/uiacceltk/hitchcock/coretoolkit/src/huicanvaswspainter.cpp	Tue Aug 31 16:07:35 2010 +0300
+++ b/uiacceltk/hitchcock/coretoolkit/src/huicanvaswspainter.cpp	Wed Sep 01 12:16:53 2010 +0100
@@ -2754,7 +2754,15 @@
     if ( oldGc && oldGc != iCanvasWsGc )
         {
         oldGc->ClearCache();
+        
+        // delete SW rendering GC when not needed
+        if ( oldGc == iCanvasWsBitGc ) 
+            {
+            delete iCanvasWsBitGc;
+            iCanvasWsBitGc = NULL;
+            }
         }
+
     if ( iCanvasWsGc )
         {
         // Forward 'enable render buffer' setting to new GC.