sfx2/source/appl/appserv.cxx | 3 +++ 1 file changed, 3 insertions(+) New commits: commit ec1afa55e8ed79dc290caff74aaca304a77c3b4f Author: Katarina Behrens <katarina.behr...@cib.de> Date: Fri Jan 13 15:33:48 2017 +0100
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.behr...@cib.de> Tested-by: Katarina Behrens <katarina.behr...@cib.de> diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 6267920..3527e02 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; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits