summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-06-14 10:11:38 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-06-14 13:08:03 +0200
commit213521b339cd39b650564ce8a695da29225012b5 (patch)
treee52f08bf4181c507a31cb39d1a5f6a5f8530a3d0 /vcl
parent7db198677d7907a1e146f0287ab742ee536f397f (diff)
disable 'Quit' when toggling a dialog hierarchy to 'busy'
Change-Id: I28773e983014596f6c6b98ab9846bae0a4b3b9ad Reviewed-on: https://gerrit.libreoffice.org/74029 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/dialog.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index ec660bf630b4..faa88a27c1da 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1607,7 +1607,10 @@ void TopLevelWindowLocker::incBusy(const weld::Window* pIgnore)
pTopWin = Application::GetNextTopLevelWindow(pTopWin);
}
for (auto& a : aTopLevels)
+ {
a->IncModalCount();
+ a->ImplGetFrame()->NotifyModalHierarchy(true);
+ }
m_aBusyStack.push(aTopLevels);
}
@@ -1619,6 +1622,7 @@ void TopLevelWindowLocker::decBusy()
if (a->IsDisposed())
continue;
a->DecModalCount();
+ a->ImplGetFrame()->NotifyModalHierarchy(false);
}
m_aBusyStack.pop();
}