--- rxvt-unicode/src/background.C	2008/11/04 14:38:29	1.32
+++ rxvt-unicode/src/background.C	2009/05/03 05:25:40	1.35
@@ -261,7 +261,7 @@
   unsigned int w = 0, h = 0;
   unsigned int n;
   unsigned long new_flags = (flags & (~geometryFlags));
-  char *p;
+  const char *p;
 #  define MAXLEN_GEOM		256 /* could be longer than regular geometry string */
 
   if (geom == NULL)
@@ -677,10 +677,10 @@
       if (!target->asimman)
         target->asimman = create_generic_imageman (target->rs[Rs_path]);
 
-      if (char *f = strchr (file, ';'))
+      if (const char *p = strchr (file, ';'))
         {
-          size_t len = f - file;
-          f = (char *)malloc (len + 1);
+          size_t len = p - file;
+          char *f = (char *)malloc (len + 1);
           memcpy (f, file, len);
           f[len] = '\0';
           original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
@@ -1139,11 +1139,11 @@
 
   XImage *result = NULL;
 # ifdef HAVE_AFTERIMAGE
-  target->init_asv ();
-
   if (original_asim
       || (background_flags & transpTransformations) != (flags & transpTransformations))
     {
+      target->init_asv ();
+
       ASImage *background = NULL;
       ARGB32 as_tint = TINT_LEAVE_SAME;
       if (background_flags)
@@ -1329,7 +1329,7 @@
          scr_touch or we get a great deal of flicker otherwise: */
       XClearWindow (target->dpy, target->parent[0]);
 
-      if (target->scrollBar.win)
+      if (target->scrollBar.state && target->scrollBar.win)
         {
           target->scrollBar.state = STATE_IDLE;
           target->scrollBar.show (0);