From 61e979e634c81fb8b5900d7b0c72183935226dc8 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 18 May 2020 22:25:52 +0300 Subject: SL-12491 semwait_signal crash Superficially it looks like mac tried to resume ms_sleep after class got destroyed by regular cleanup. --- indra/newview/llappviewer.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'indra/newview/llappviewer.cpp') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 335c414015..6836ec7479 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1516,8 +1516,10 @@ bool LLAppViewer::doFrame() } // yield cooperatively when not running as foreground window - if ( (gViewerWindow && !gViewerWindow->getWindow()->getVisible()) - || !gFocusMgr.getAppHasFocus()) + // and when not quiting (causes trouble at mac's cleanup stage) + if (!LLApp::isExiting() + && ((gViewerWindow && !gViewerWindow->getWindow()->getVisible()) + || !gFocusMgr.getAppHasFocus())) { // Sleep if we're not rendering, or the window is minimized. static LLCachedControl s_bacground_yeild_time(gSavedSettings, "BackgroundYieldTime", 40); -- cgit v1.2.3