diff options
| author | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
| commit | 813ac136e48f60d4c2b13e808107870dafcc4d52 (patch) | |
| tree | 396a6c98276f6e9a04216933daebdf3af7b81d46 /jwxyz/jwxyz-common.c | |
| parent | Flush X events before locking if we have an external ungrab command (diff) | |
| parent | Update to 5.43 (diff) | |
| download | xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.gz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.xz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.zip | |
Merge branch 'master' into openslx (5.43)
Diffstat (limited to 'jwxyz/jwxyz-common.c')
| -rw-r--r-- | jwxyz/jwxyz-common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/jwxyz/jwxyz-common.c b/jwxyz/jwxyz-common.c index 1a31ae3..febb3b5 100644 --- a/jwxyz/jwxyz-common.c +++ b/jwxyz/jwxyz-common.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 1991-2018 Jamie Zawinski <jwz@jwz.org> +/* xscreensaver, Copyright (c) 1991-2019 Jamie Zawinski <jwz@jwz.org> * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -103,6 +103,7 @@ XDisplayHeightMM (Display *dpy, int screen) unsigned long XBlackPixelOfScreen(Screen *screen) { + if (! screen) abort(); return DefaultVisualOfScreen (screen)->alpha_mask; } |