(svn r11154) -Fix [FS#1239]: MIDI failing to play under Windows 95, 98 and ME.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/music/win32_m.cpp b/src/music/win32_m.cpp
index 35e7cdef3..2310c50e2 100644
--- a/src/music/win32_m.cpp
+++ b/src/music/win32_m.cpp
@@ -142,7 +142,11 @@ const char *MusicDriver_Win32::Start(const char * const *parm)
 	}
 
 	if (NULL == (_midi.wait_obj = CreateEvent(NULL, FALSE, FALSE, NULL))) return "Failed to create event";
-	if (NULL == (_midi.thread = CreateThread(NULL, 8192, MidiThread, 0, 0, NULL))) return "Failed to create thread";
+
+	/* The lpThreadId parameter of CreateThread (the last parameter)
+	 * may NOT be NULL on Windows 95, 98 and ME. */
+	DWORD threadId;
+	if (NULL == (_midi.thread = CreateThread(NULL, 8192, MidiThread, 0, 0, &threadId))) return "Failed to create thread";
 
 	return NULL;
 }