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.35.tar.gz
[xscreensaver]
/
hacks
/
celtic.c
diff --git
a/hacks/celtic.c
b/hacks/celtic.c
index 103b64718b03814e698f2b0fb0cf1c35e476e707..890b3982a96d6a2b98c5c0d6bf3665e64b425802 100644
(file)
--- a/
hacks/celtic.c
+++ b/
hacks/celtic.c
@@
-14,11
+14,12
@@
*/
#include <math.h>
*/
#include <math.h>
-#include <assert.h>
#include "screenhack.h"
#include "erase.h"
#define SQRT_3 1.73205080756887729352
#include "screenhack.h"
#include "erase.h"
#define SQRT_3 1.73205080756887729352
+#undef assert
+#define assert(EXP) do { if (!((EXP))) abort(); } while(0)
/*-----------------------------------------*/
/*-----------------------------------------*/
@@
-838,7
+839,7
@@
static const char *celtic_defaults[] = {
"*delay: 10000",
"*delay2: 5",
"*showGraph: False",
"*delay: 10000",
"*delay2: 5",
"*showGraph: False",
-#ifdef
USE_IPHON
E
+#ifdef
HAVE_MOBIL
E
"*ignoreRotation: True",
#endif
0
"*ignoreRotation: True",
#endif
0
@@
-978,7
+979,9
@@
celtic_draw (Display *dpy, Window window, void *closure)
st->force_reset = 0;
st->t = 1;
st->force_reset = 0;
st->t = 1;
- pattern_del(st->pattern);
+ if (st->pattern != NULL) {
+ pattern_del(st->pattern);
+ }
st->pattern = NULL;
graph_del(st->graph);
st->pattern = NULL;
graph_del(st->graph);