summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorKatarina Behrens <Katarina.Behrens@cib.de>2017-01-13 15:33:48 +0100
committerKatarina Behrens <Katarina.Behrens@cib.de>2017-01-13 21:29:04 +0000
commitec1afa55e8ed79dc290caff74aaca304a77c3b4f (patch)
tree35bded5795cf2803d1cb290d1016d8bbe2a6973d /sfx2
parent2d6c7ebe83c2fec4b43ec8e410fd24450958d63f (diff)
SafeMode: Deactivate 'Restart in safe mode' when already in safe mode
Change-Id: I75f7024528190cf3732fb80063132ef0c6de3118 Reviewed-on: https://gerrit.libreoffice.org/33049 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/appserv.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 62679201870a..3527e0268fc5 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -1174,6 +1174,9 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
}
case SID_SAFE_MODE:
{
+ // no restart in safe mode when already in safe mode
+ if ( Application::IsSafeModeEnabled() )
+ rSet.DisableItem( SID_SAFE_MODE );
break;
}