From ad7e1384cc195bc88ac1f659914f22bfd97661c1 Mon Sep 17 00:00:00 2001 From: spanne Date: Fri, 31 Dec 2004 17:26:13 +0000 Subject: [PATCH] Fixed first bug of #1064195 (two things when using signals): Don't issue a warning about select when a non-blocked signal was caught. This makes sense and is more compatible with GLUT. git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@531 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/ChangeLog | 4 ++++ freeglut/freeglut/src/freeglut_main.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/freeglut/freeglut/ChangeLog b/freeglut/freeglut/ChangeLog index 3e1efaf..c235ea7 100644 --- a/freeglut/freeglut/ChangeLog +++ b/freeglut/freeglut/ChangeLog @@ -708,3 +708,7 @@ unimplemented). (187) Fixed bug #1045054 (KeyReleaseMask typo). (188) Fixed bug #1040435 (glutBitmapString() bug). + +(189) Fixed first bug of #1064195 (two things when using signals): +Don't issue a warning about select when a non-blocked signal was +caught. This makes sense and is more compatible with GLUT. diff --git a/freeglut/freeglut/src/freeglut_main.c b/freeglut/freeglut/src/freeglut_main.c index 1fae543..705f52b 100644 --- a/freeglut/freeglut/src/freeglut_main.c +++ b/freeglut/freeglut/src/freeglut_main.c @@ -478,7 +478,7 @@ static void fghSleepForEvents( void ) wait.tv_usec = (msec % 1000) * 1000; err = select( socket+1, &fdset, NULL, NULL, &wait ); - if( -1 == err ) + if( ( -1 == err ) && ( errno != EINTR ) ) fgWarning ( "freeglut select() error: %d", errno ); } #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE