Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Author: Kyle Yuan

Browse Source 
r=edburns

bugfix from Kyle.  Prep for future work.


git-svn-id: svn://10.0.0.236/trunk@142439 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2003-05-14 15:54:45 +00:00
parent c903f0e328
commit a91359c022
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/java/webclient/src_moz/NativeEventThread.cpp
View File

@@ -230,11 +230,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_NativeEventThr
return;
}
void* threadId = PR_GetCurrentThread();
if (threadId == (void *) gEmbeddedThread) {
// printf("--------- Thread ID ---- %p\n",gEmbeddedThread);
processEventLoop(initContext);
}
processEventLoop(initContext);
}
/**
@@ -400,6 +396,12 @@ Java_org_mozilla_webclient_wrapper_1native_NativeEventThread_nativeRemoveAllList
int processEventLoop(WebShellInitContext * initContext)
{
if (PR_GetCurrentThread() != gEmbeddedThread)
return 0;
if (nsnull == initContext)
return 0;
#ifdef XP_UNIX
while(gtk_events_pending()) {
gtk_main_iteration();
@@ -778,11 +780,7 @@ nsresult InitMozillaStuff (WebShellInitContext * initContext)
}
#endif
// PENDING(kyle): not sure if we need to check this, but it does prevent some crash from happening
void* threadId = PR_GetCurrentThread();
if (threadId == (void *) gEmbeddedThread)
// Just need to loop once to clear out events before returning
processEventLoop(initContext);
processEventLoop(initContext);
return rv;
}