jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix shutdown crash

Browse Source
This commit is contained in:
jsorg71 2008-03-28 04:54:19 +00:00
parent ae7bc310d6
commit 5e6f2eec0a
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xrdp/xrdp.c
View File

@ -84,15 +84,10 @@ xrdp_shutdown(int sig)
g_writeln("shutting down"); g_writeln("shutting down");
g_writeln("signal %d threadid $%8.8x", sig, tc_get_threadid()); g_writeln("signal %d threadid $%8.8x", sig, tc_get_threadid());
listen = g_listen; listen = g_listen;
g_listen = 0;
if (listen != 0) if (listen != 0)
{ {
g_set_term(1); g_set_term(1);
g_sleep(1000);
xrdp_listen_delete(listen);
} }
/* delete the xrdp.pid file */
g_file_delete(XRDP_PID_FILE);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -234,11 +229,11 @@ MyServiceMain(DWORD dwArgc, LPTSTR* lpszArgv)
//g_sprintf(text, "RegisterServiceCtrlHandler failed\r\n"); //g_sprintf(text, "RegisterServiceCtrlHandler failed\r\n");
//g_file_write(fd, text, g_strlen(text)); //g_file_write(fd, text, g_strlen(text));
} }
WSACleanup(); xrdp_listen_delete(g_listen);
tc_mutex_delete(g_term_mutex); tc_mutex_delete(g_term_mutex);
tc_mutex_delete(g_sync_mutex); tc_mutex_delete(g_sync_mutex);
tc_mutex_delete(g_sync1_mutex); tc_mutex_delete(g_sync1_mutex);
xrdp_listen_delete(g_listen); WSACleanup();
//CloseHandle(event_han); //CloseHandle(event_han);
} }
@ -521,13 +516,17 @@ main(int argc, char** argv)
g_sync_mutex = tc_mutex_create(); g_sync_mutex = tc_mutex_create();
g_sync1_mutex = tc_mutex_create(); g_sync1_mutex = tc_mutex_create();
xrdp_listen_main_loop(g_listen); xrdp_listen_main_loop(g_listen);
xrdp_listen_delete(g_listen);
tc_mutex_delete(g_term_mutex); tc_mutex_delete(g_term_mutex);
tc_mutex_delete(g_sync_mutex); tc_mutex_delete(g_sync_mutex);
tc_mutex_delete(g_sync1_mutex); tc_mutex_delete(g_sync1_mutex);
#if defined(_WIN32) #if defined(_WIN32)
/* I don't think it ever gets here */ /* I don't think it ever gets here */
/* when running in win32 app mode, control c exits right away */
WSACleanup(); WSACleanup();
xrdp_listen_delete(g_listen); #else
/* delete the xrdp.pid file */
g_file_delete(XRDP_PID_FILE);
#endif #endif
return 0; return 0;
} }