projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.27.tar.gz
[xscreensaver]
/
hacks
/
apple2-main.c
diff --git
a/hacks/apple2-main.c
b/hacks/apple2-main.c
index ef21995b2ce9cf85db2ab808f8a0aa9fff79cddf..060e9b800ea884b1aa5fb20a6d2c6b75d556a46b 100644
(file)
--- a/
hacks/apple2-main.c
+++ b/
hacks/apple2-main.c
@@
-762,7
+762,21
@@
static void slideshow_controller(apple2_sim_t *sim, int *stepno,
*stepno=10;
break;
*stepno=10;
break;
+ case 80:
+ /* Do nothing, just wait */
+ *next_actiontime += 2.0;
+ *stepno = A2CONTROLLER_FREE;
+ break;
+
case A2CONTROLLER_FREE:
case A2CONTROLLER_FREE:
+ /* It is possible that still image is being loaded,
+ in that case mine cannot be freed, because
+ callback function tries to use it, so wait.
+ */
+ if (mine->image_loading_p) {
+ *stepno = 80;
+ break;
+ }
free(mine->render_img);
free(mine->img_filename);
free(mine);
free(mine->render_img);
free(mine->img_filename);
free(mine);
@@
-1770,7
+1784,11
@@
apple2_draw (Display *dpy, Window window, void *closure)
st->sim = 0;
}
st->sim = 0;
}
- return 10000;
+#ifdef USE_IPHONE
+ return 0;
+#else
+ return 5000;
+#endif
}
static void
}
static void