Kaydet (Commit) d7f3eed1 authored tarafından Caolán McNamara's avatar Caolán McNamara

afl-eventtesting: improve event testing exit

don't "Quit" twice and skip tearing down office ipc etc for the pseudo-quit
AFL_PERSISTENT=1 case

Change-Id: I26f0e798b95bc9376890381d4e5bd87fe8f12622
üst 7e010826
......@@ -231,8 +231,13 @@ sal_Bool SAL_CALL Desktop::terminate()
// try to close all open frames.
// Allow using of any UI ... because Desktop.terminate() was designed as UI functionality in the past.
bool bAllowUI = !Application::IsEventTestingModeEnabled();
bool bFramesClosed = impl_closeFrames(bAllowUI);
bool bIsEventTestingMode = Application::IsEventTestingModeEnabled();
bool bFramesClosed = impl_closeFrames(!bIsEventTestingMode);
if (bIsEventTestingMode)
{
Application::Quit();
return true;
}
if ( ! bFramesClosed )
{
impl_sendCancelTerminationEvent(lCalledTerminationListener);
......
......@@ -407,7 +407,6 @@ namespace
Application::EndAllPopups();
Application::EndAllDialogs();
Application::PostUserEvent( LINK( NULL, ImplSVAppData, ImplPrepareExitMsg ) );
Application::Quit();
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment