Skip to content
Snippets Groups Projects
Commit f7588522 authored by Aimee Linden's avatar Aimee Linden
Browse files

DEV-42251 (SNOW-570 / SNOW-220 / VWR-14711): WaitNextEvent() is deprecated in the OS X 10.6 SDK

Imported from Snowglobe.
Use RunApplicationEventLoop() instead of WaitNextEvent() while the viewer is waiting for the crash logger to exit.
parent 5fa00a67
No related branches found
No related tags found
No related merge requests found
...@@ -17,6 +17,7 @@ Agathos Frascati ...@@ -17,6 +17,7 @@ Agathos Frascati
CT-317 CT-317
CT-352 CT-352
Aimee Trescothick Aimee Trescothick
SNOW-570
SNOW-572 SNOW-572
VWR-3321 VWR-3321
VWR-3336 VWR-3336
...@@ -49,6 +50,7 @@ Aimee Trescothick ...@@ -49,6 +50,7 @@ Aimee Trescothick
VWR-14087 VWR-14087
VWR-14267 VWR-14267
VWR-14278 VWR-14278
VWR-14711
VWR-14712 VWR-14712
Alejandro Rosenthal Alejandro Rosenthal
VWR-1184 VWR-1184
......
...@@ -291,6 +291,7 @@ static OSStatus CarbonEventHandler(EventHandlerCallRef inHandlerCallRef, ...@@ -291,6 +291,7 @@ static OSStatus CarbonEventHandler(EventHandlerCallRef inHandlerCallRef,
if(os_result >= 0 && matching_psn) if(os_result >= 0 && matching_psn)
{ {
sCrashReporterIsRunning = false; sCrashReporterIsRunning = false;
QuitApplicationEventLoop();
} }
} }
return noErr; return noErr;
...@@ -326,7 +327,7 @@ void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze) ...@@ -326,7 +327,7 @@ void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze)
// *NOTE:Mani A better way - make a copy of the data that the crash reporter will send // *NOTE:Mani A better way - make a copy of the data that the crash reporter will send
// and let SL go about its business. This way makes the mac work like windows and linux // and let SL go about its business. This way makes the mac work like windows and linux
// and is the smallest patch for the issue. // and is the smallest patch for the issue.
sCrashReporterIsRunning = true; sCrashReporterIsRunning = false;
ProcessSerialNumber o_psn; ProcessSerialNumber o_psn;
static EventHandlerRef sCarbonEventsRef = NULL; static EventHandlerRef sCarbonEventsRef = NULL;
...@@ -356,15 +357,13 @@ void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze) ...@@ -356,15 +357,13 @@ void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze)
if(os_result >= 0) if(os_result >= 0)
{ {
EventRecord evt; sCrashReporterIsRunning = true;
while(sCrashReporterIsRunning) }
{
while(WaitNextEvent(osMask, &evt, 0, NULL)) while(sCrashReporterIsRunning)
{ {
// null op!?! RunApplicationEventLoop();
} }
}
}
// Re-install the apps quit handler. // Re-install the apps quit handler.
AEInstallEventHandler(kCoreEventClass, AEInstallEventHandler(kCoreEventClass,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment