[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49282] trunk/blender/source/blender/ windowmanager/intern/wm_init_exit.c: GetStdHandle may return NULL, which isn't really an error, or INVALID_HANDLE_VALUE which does indicate an error, but both should be checked.

[Jason Wilkins]

Revision: 49282
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49282
Author:   jwilkins
Date:     2012-07-27 10:48:33 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
GetStdHandle may return NULL, which isn't really an error, or INVALID_HANDLE_VALUE which does indicate an error, but both should be checked.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c	2012-07-27 10:27:28 UTC (rev 49281)
+++ trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c	2012-07-27 10:48:33 UTC (rev 49282)
@@ -335,14 +335,12 @@
 extern void free_posebuf(void); 
 
 #if WIN32
-/* read console events until there is a keyboard event, then return */
+/* Read console events until there is a key event.  Also returns on any error. */
 static void wait_for_console_key(void)
 {
-	HANDLE hConsoleInput;
+	HANDLE hConsoleInput = GetStdHandle(STD_INPUT_HANDLE);
 
-	hConsoleInput = GetStdHandle(STD_INPUT_HANDLE);
-
-	if (hConsoleInput && FlushConsoleInputBuffer(hConsoleInput)) {
+	if (!ELEM(hConsoleInput, NULL, INVALID_HANDLE_VALUE) && FlushConsoleInputBuffer(hConsoleInput)) {
 		for(;;) {
 			INPUT_RECORD buffer;
 			DWORD ignored;