summaryrefslogtreecommitdiff
path: root/desktop/source/deployment
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-11-28 12:47:04 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-11-28 16:12:01 +0100
commitd6938caa27d22cc9c1f363df695c3621cce8ac86 (patch)
tree1d9c01d8131d431a95949901c6907f7e3b479992 /desktop/source/deployment
parent7eeb1f63778c4c1b7c80df2defccd4a9cb91f615 (diff)
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 <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'desktop/source/deployment')
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx4
1 files changed, 3 insertions, 1 deletions
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;