[mupen64plus] 225/262: Don't kill emulation when a child thread stops

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit cbe7a4ff997ee79fdb7f0f6394c4c14b89b7e174
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun May 8 18:34:48 2011 +0200

    Don't kill emulation when a child thread stops
---
 debian/changelog             |  1 +
 debian/patches/series        |  1 +
 debian/patches/sigchld.patch | 17 +++++++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 801b1ed..32f8909 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mupen64plus (1.5+dfsg1-16) UNRELEASED; urgency=low
     - Add rtc.patch, Add support for n64 internal clock
     - Add n64_romswap.patch, Fix swapping of n64 images
     - Add g_type_init.patch, Call g_type_init before starting gui
+    - Add sigchld.patch, Don't kill emulation when a child thread stops
   * Upgraded to policy 3.9.2, no changes required
 
  -- Sven Eckelmann <sven at narfation.org>  Wed, 09 Mar 2011 10:38:22 +0100
diff --git a/debian/patches/series b/debian/patches/series
index a947457..20bd8f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -51,3 +51,4 @@ inline_header.patch
 rtc.patch
 n64_romswap.patch
 g_type_init.patch
+sigchld.patch
diff --git a/debian/patches/sigchld.patch b/debian/patches/sigchld.patch
new file mode 100644
index 0000000..ecd8ea6
--- /dev/null
+++ b/debian/patches/sigchld.patch
@@ -0,0 +1,17 @@
+Description: Don't kill emulation when a child thread stops
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/main/main.c b/main/main.c
+index d3511e834716078eb2a2bfe6eee3b2e4ea6f4a3e..0111f62b9ca48f8595d1c5985a6486c45d6937b8 100644
+--- a/main/main.c
++++ b/main/main.c
+@@ -847,7 +847,7 @@ static int emulationThread( void *_arg )
+         sigaction( SIGSEGV, &sa, NULL );
+         sigaction( SIGILL, &sa, NULL );
+         sigaction( SIGFPE, &sa, NULL );
+-        sigaction( SIGCHLD, &sa, NULL );
++        //sigaction( SIGCHLD, &sa, NULL );
+ #endif 
+     }
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git