strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix crash in exiting via disabling lone quick-starter, terminate at idle

Browse source
This commit is contained in:
Michael Meeks 2010-11-25 16:25:55 +00:00
parent 84c7ee1cdb
commit 0219642858
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sfx2/source/appl/shutdownicon.cxx
View file

@ -182,6 +182,9 @@ bool ShutdownIcon::LoadModule( osl::Module **pModule,
return true;
}
// These two timeouts are necessary to avoid there being
// plugin frames still on the stack, after unloading that
// code, causing a crash during disabling / termination.
class IdleUnloader : Timer
{
::osl::Module *m_pModule;
@ -199,6 +202,22 @@ public:
}
};
class IdleTerminate : Timer
{
Reference< XDesktop > m_xDesktop;
public:
IdleTerminate (Reference< XDesktop > xDesktop)
{
m_xDesktop = xDesktop;
Start();
}
virtual void Timeout()
{
m_xDesktop->terminate();
delete this;
}
};
void ShutdownIcon::initSystray()
{
if (m_bInitialized)
@ -576,11 +595,8 @@ void ShutdownIcon::terminateDesktop()
if ( xSupplier.is() )
{
Reference< XIndexAccess > xTasks ( xSupplier->getFrames(), UNO_QUERY );
if( xTasks.is() )
{
if( xTasks->getCount() < 1 )
xDesktop->terminate();
}
if( xTasks.is() && xTasks->getCount() < 1 )
new IdleTerminate( xDesktop );
}
// remove the instance pointer