TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
David Rose 2009-10-08 19:07:37 +00:00
parent f0d19f90a9
commit abae156103
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
direct/src/plugin/p3dMainObject.cxx
View File

@ -408,8 +408,8 @@ read_log(const string &log_pathname, P3D_object *params[], int num_params) {
}
log.read(buffer, size);
P3D_object *result = new P3DStringObject(buffer, size);
P3D_object *result = new P3DStringObject(buffer, log.gcount());
delete[] buffer;
return result;
}

13
direct/src/plugin/p3dWinSplashWindow.cxx
View File

@ -302,9 +302,16 @@ stop_thread() {
PostThreadMessage(_thread_id, WM_USER, 0, 0);
}
if (_thread != NULL){
WaitForSingleObject(_thread, INFINITE);
if (_thread != NULL){
// If the thread doesn't close right away, call PeekMessage() to
// check for Windows messages that the thread might be waiting
// for.
while (WaitForSingleObject(_thread, 200) == WAIT_TIMEOUT) {
MSG msg;
PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE | PM_NOYIELD);
nout << "Waiting for thread\n";
}
CloseHandle(_thread);
_thread = NULL;