Fix bug: X11 server keeps sending USR1 signals.

2 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index de49d52..71ad8de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 User johns
 Date:
 
+    Fix bug: X11 server keeps sending USR1 signals, which confuses suspend.
     Show message for hot-keys.
     Fix bug: playback errors with old PES recordings.
     Adds Hot-key support for 4:3 zoom modes.
diff --git a/softhddev.c b/softhddev.c
index 796e349..2df19c9 100644
--- a/softhddev.c
+++ b/softhddev.c
@@ -2333,6 +2333,8 @@ static void StartXServer(void)
     argn = 1;
     if (X11DisplayName) {		// append display name
 	args[argn++] = X11DisplayName;
+	// export display for childs
+	setenv("DISPLAY", X11DisplayName, 1);
     }
     //	split X server arguments string into words
     if ((sval = X11ServerArguments)) {
@@ -2370,10 +2372,12 @@ static void StartXServer(void)
     }
     // child
     signal(SIGUSR1, SIG_IGN);		// ignore to force answer
+    //setpgid(0,getpid());
     //	start the X server
     execvp(args[0], (char *const *)args);
 
     Error(_("x-setup: Failed to start X server '%s'\n"), args[0]);
+    exit(-1);
 }
 
 /**
@@ -2495,6 +2499,8 @@ void Housekeeping(void)
 void MainThreadHook(void)
 {
     if (Usr1Signal) {			// x11 server ready
+	// FIYME: x11 server keeps sending sigusr1 signals
+	signal(SIGUSR1, SIG_IGN);	// ignore further signals
 	Usr1Signal = 0;
 	StartVideo();
 	VideoDisplayWakeup();