zdoom
/
fluidsynth
mirror of https://github.com/ZDoom/fluidsynth.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #304 from carlo-bramini/tcpip-win32-fix 

Fix crash to TCP server (WIN32).
This commit is contained in:
Tom M 2017-12-14 16:54:51 +01:00 committed by GitHub
parent af0301ae3b 46733af348
commit e4f338d014
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fluidsynth.c
View File

@ -736,7 +736,7 @@ int main(int argc, char** argv)
cleanup: cleanup:
#if !defined(MACINTOSH) && !defined(WIN32) #if !defined(MACINTOSH)
if (server != NULL) { if (server != NULL) {
/* if the user typed 'quit' in the shell, kill the server */ /* if the user typed 'quit' in the shell, kill the server */
if (!interactive) { if (!interactive) {

4
src/utils/fluid_sys.c
View File

@ -1161,8 +1161,10 @@ void delete_fluid_server_socket(fluid_server_socket_t *server_socket)
if (server_socket->socket != INVALID_SOCKET) if (server_socket->socket != INVALID_SOCKET)
fluid_socket_close (server_socket->socket); fluid_socket_close (server_socket->socket);
if (server_socket->thread) if (server_socket->thread) {
fluid_thread_join(server_socket->thread);
delete_fluid_thread (server_socket->thread); delete_fluid_thread (server_socket->thread);
}
FLUID_FREE (server_socket); FLUID_FREE (server_socket);