From d0ac732d8e5bbf06055589f52b6355f76a2405da Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Wed, 4 Jul 2018 16:00:01 +0200
Subject: [PATCH] X11: fix for Mac OS X

---
 src/Makefile | 3 +++
 src/input.c  | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/Makefile b/src/Makefile
index c36b0d30..7bdc8fa0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -697,6 +697,9 @@ $(MACAPPEXE) : $(BIN) $(OBJDIR)/versiontag
 	echo 'APPL????' > Grafx2.app/Contents/PkgInfo
 	cp ../Info.plist Grafx2.app/Contents
 	cp -r Grafx2.icns Grafx2.app/Contents/Resources
+ifeq ($(API),x11)
+	cp ../share/grafx2/gfx2.png Grafx2.app/Contents/Resources
+endif
 	mkdir -p Grafx2.app/Contents/Resources/English.lproj
 	iconv -f UTF-16BE English.lproj/InfoPlist.strings | sed -e 's/Grafx2 version [.0-9]*/Grafx2 version $(shell cat $(OBJDIR)/versiontag)/' | iconv -t UTF-16BE > Grafx2.app/Contents/Resources/English.lproj/InfoPlist.strings
 	cp -r ../share/grafx2/fonts Grafx2.app/Contents/Resources
diff --git a/src/input.c b/src/input.c
index e662134e..5740ea60 100644
--- a/src/input.c
+++ b/src/input.c
@@ -1251,6 +1251,8 @@ int Get_input(int sleep_time)
     Input_new_mouse_Y = Mouse_Y;
     Input_new_mouse_K = Mouse_K;
 
+    if (X11_display == NULL)
+      return 0;
     XFlush(X11_display);
     while(!user_feedback_required && XPending(X11_display) > 0)
     {