CrashReportDialog: Enter safemode only after sending crash report

Change-Id: I2c78431f839050ca74b082f7c790d0c59fba6513

2 files changed, 15 insertions, 9 deletions

diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx
index 1692a444fa53..ed56b67678af 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -60,6 +60,19 @@ void CrashReportDialog::dispose()
     Dialog::dispose();
 }
 
+bool CrashReportDialog::Close()
+{
+    // Check whether to go to safe mode
+    if (mpCBSafeMode->IsChecked())
+    {
+        sfx2::SafeMode::putFlag();
+        css::task::OfficeRestartManager::get(comphelper::getProcessComponentContext())->requestRestart(
+            css::uno::Reference< css::task::XInteractionHandler >());
+    }
+
+    return Dialog::Close();
+}
+
 IMPL_LINK(CrashReportDialog, BtnHdl, Button*, pBtn, void)
 {
     if (pBtn == mpBtnSend.get())
@@ -101,15 +114,6 @@ IMPL_LINK(CrashReportDialog, BtnHdl, Button*, pBtn, void)
     {
         Close();
     }
-
-    // Check whether to go to safe mode
-    if (mpCBSafeMode->IsChecked())
-    {
-        sfx2::SafeMode::putFlag();
-        css::uno::Reference< css::uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
-        css::task::OfficeRestartManager::get(xContext)->requestRestart(
-            css::uno::Reference< css::task::XInteractionHandler >());
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/crashreportdlg.hxx b/svx/source/dialog/crashreportdlg.hxx
index ecdd44553eb7..b0014364bd06 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -26,6 +26,8 @@ public:
 
     virtual void dispose() override;
 
+    virtual bool Close() override;
+
 private:
 
     VclPtr<Button> mpBtnSend;