Merge branch 'master' of goat:git/dosdemo

diff --cc src/demo.c
index 98f8001,a9611f6..9954cb5
--- 1/src/demo.c
--- 2/src/demo.c
+++ b/src/demo.c
@@@ -26,11 -20,10 +27,13 @@@ int demo_init(int argc, char **argv
        if(scr_init() == -1) {
                return -1;
        }
 -      scr_change(scr_lookup("tunnel"), 4000);
 +      if(scr_change(scr_lookup(start_scr_name), 4000) == -1) {
 +              fprintf(stderr, "screen %s not found\n", start_scr_name);
 +              return -1;
 +      }
  
+       /* clear the framebuffer at least once */
+       memset(fb_pixels, 0, fb_width * fb_height * fb_bpp / CHAR_BIT);
        return 0;
  }