desktop/source/deployment/gui/dp_gui_dialog2.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit d6938caa27d22cc9c1f363df695c3621cce8ac86 Author: Caolán McNamara <[email protected]> AuthorDate: Wed Nov 28 12:47:04 2018 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Nov 28 16:12:01 2018 +0100 make unopkg gui not ask to 'restart' on extension changes Change-Id: I185527fcc4481ab2bd97ad81849ee38c6fa50919 Reviewed-on: https://gerrit.libreoffice.org/64167 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 62e2e301bfc4..28bfeee06b53 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -1080,7 +1080,9 @@ bool ExtMgrDialog::Close() if (!m_bClosed && m_pManager->isModified()) { m_pManager->clearModified(); - Application::PostUserEvent(LINK(nullptr, ExtMgrDialog, Restart), m_xRestartParent); + //only suggest restart if we're actually running, e.g. not from standalone unopkg gui + if (dp_misc::office_is_running()) + Application::PostUserEvent(LINK(nullptr, ExtMgrDialog, Restart), m_xRestartParent); } m_bClosed = true; return bRet; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
