summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorAndreas Schlüns <as@openoffice.org>2001-05-04 12:29:04 +0000
committerAndreas Schlüns <as@openoffice.org>2001-05-04 12:29:04 +0000
commit5f00f283dc5b57248a22ea3366c2c01c9d087387 (patch)
tree0d2779feb475a91ca59a38ba326184e4481b53a6 /framework
parent92223d29624e4cbeec53d193f55b65b898fa2a09 (diff)
reactivate quit timer if terminate failed
Diffstat (limited to 'framework')
-rw-r--r--framework/source/services/desktop.cxx11
1 files changed, 9 insertions, 2 deletions
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 398eddad5def..0657125b1f5e 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: desktop.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: as $ $Date: 2001-05-02 12:58:40 $
+ * last change: $Author: as $ $Date: 2001-05-04 13:29:04 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -493,6 +493,13 @@ sal_Bool SAL_CALL Desktop::terminate() throw( RuntimeException )
impl_sendNotifyTerminationEvent();
}
+ // If somewhere break this terminate operation and we must return FALSE ...
+ // we must reactivate our quit timer!
+ // Otherwise we live for ever.
+ else
+ {
+ m_aChildTaskContainer.enableQuitTimer( this );
+ }
// Return result of this question.
return bReturn;