xduplic-copier: Print error message, rather than segfaulting, if XOpenDisplay fails.

[chiark-utils.git] / cprogs / xduplic-copier.c

diff --git a/cprogs/xduplic-copier.c b/cprogs/xduplic-copier.c
index 8c1da088778747cc196df8f9cb2de07004d91e46..7118d951a9d8444f121979b55b9b8d1e8bbda211 100644 (file)
--- a/cprogs/xduplic-copier.c
+++ b/cprogs/xduplic-copier.c
@@ -144,8 +144,7 @@ static void buttonpress(XButtonEvent *e) {
 
   if (e->window != e->root) return;
 
-  sw= XmuClientWindow(display, e->subwindow);
-  if (!sw) {
+  if (!e->subwindow) {
     if (!rightbutton) {
       stopselecting();
     } else {
@@ -160,6 +159,8 @@ static void buttonpress(XButtonEvent *e) {
     return;
   }
 
+  sw= XmuClientWindow(display, e->subwindow);
+
   if (sw == w) { beep(); return; }
 
   for (ownp=&headwn;
@@ -233,6 +234,7 @@ int main(int argc, const char **argv) {
   Font font;
 
   display= XOpenDisplay(0);
+  if (!display) { fputs("XOpenDisplay failed\n",stderr); exit(-1); }
   screen= DefaultScreen(display);
   cmap= DefaultColormap(display,screen);
   root= DefaultRootWindow(display);