X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fdemo.c;h=76e8917d6843797325700804f0cfa9d6884f7fe9;hp=e92e9617a1da6c111758a8e2dd2a1fbdeeab86d3;hb=3210e7e80ee2b5a7d2049a5aaff9f17b9c93dcc9;hpb=cf665b135b41d4f42067f9d9a8111c9602777cc1 diff --git a/driver/demo.c b/driver/demo.c index e92e9617..76e8917d 100644 --- a/driver/demo.c +++ b/driver/demo.c @@ -74,6 +74,7 @@ #include "resources.h" /* for parse_time() */ #include "visual.h" /* for has_writable_cells() */ #include "remote.h" /* for xscreensaver_command() */ +#include "usleep.h" #include #include @@ -1266,6 +1267,11 @@ main (int argc, char **argv) memcpy (short_version, screensaver_id + 17, 4); short_version [4] = 0; + p->db = db; + p->fading_possible_p = True; + load_init_file (p); + *p2 = *p; + /* Now that Xt has been initialized, we can set our `progname' variable to something that makes more sense (like our "real" argv[0].) @@ -1273,11 +1279,6 @@ main (int argc, char **argv) progname = real_progname; - p->db = db; - p->fading_possible_p = True; - load_init_file (p); - *p2 = *p; - #ifdef HAVE_ATHENA global_prefs_kludge = p; /* I hate C so much... */ #endif /* HAVE_ATHENA */