--- a/uiacceltk/hitchcock/coretoolkit/src/HuiRosterImpl.cpp	Tue Feb 02 07:56:43 2010 +0200
+++ b/uiacceltk/hitchcock/coretoolkit/src/HuiRosterImpl.cpp	Mon Feb 22 17:57:49 2010 +0200
@@ -527,10 +527,12 @@
     TInt j = 0;
 
     CHuiDisplay* display = aDisplay ? aDisplay : iDisplay;
+    
+    ASSERT(display!=NULL);
 
     if (iCanvasRenderBuffer && iCanvasGc)
         {
-        DrawSelfFrozen(aGc, aDisplay);
+        DrawSelfFrozen(aGc, display);
         return;
         }
 
@@ -1214,13 +1216,11 @@
         for(TInt i = 0; i < visualCount; ++i)
             {
             // Ignore inactive visuals
-            if ( entry.iRootVisuals[i]->Flags()& EHuiVisualFlagInactive )
+            if ( !(entry.iRootVisuals[i]->Flags()& EHuiVisualFlagInactive) )
                 {
-                continue; 
-                }
-            
-            // This will clear the change flags of the entire tree of visuals.
-            entry.iRootVisuals[i]->ClearChanged();
+                // This will clear the change flags of the entire tree of visuals.
+                entry.iRootVisuals[i]->ClearChanged(); 
+                }            
             }
         }
     }