diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-11-25 16:25:55 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-11-26 15:33:00 +0000 |
| commit | 448d3cfe248fe733dfcb1d857f016db7780d90a9 (patch) | |
| tree | f3edc60b34dd98b491f043417e5d27a9db42861e | |
| parent | 83d985d952229d5cd9c8c9be572f4b7b05530caa (diff) | |
fix crash in exiting via disabling lone quick-starter, terminate at idle
| -rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index e49584308b..26ec5c9f3b 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -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 |