diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-04-07 11:22:52 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-04-08 11:25:05 +0200 |
| commit | 7eb78233b46652f4317aef34a1bac4d084b00e2d (patch) | |
| tree | b7873e956f9151697dfc3862d8dec1beb1e7de22 /vcl | |
| parent | f570e6618611c2ba239ff686e120d8a4508580c3 (diff) | |
Resolves: tdf#131715 don't keep trying the same page if we're already on it
return of false means we didn't change page for some reason, the idea is
that it might be blocked to go to another page, in which case sync with
what page we ended up on, but don't bother with that if the dest page
would be the same as the current page
Change-Id: I280128240601413fb6d027d001b2ecc9a4efa76f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91718
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 72db47b4e4f7..9bfeb9997041 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -1933,8 +1933,9 @@ IMPL_LINK_NOARG(SalInstanceAssistant, OnRoadmapItemSelected, LinkParamNone*, voi { if (notify_events_disabled()) return; - int nPageIndex(find_id(m_xWizard->GetCurrentRoadmapItemID())); - if (!signal_jump_page(get_page_ident(nPageIndex))) + auto nCurItemId = m_xWizard->GetCurrentRoadmapItemID(); + int nPageIndex(find_id(nCurItemId)); + if (!signal_jump_page(get_page_ident(nPageIndex)) && nCurItemId != m_xWizard->GetCurLevel()) m_xWizard->SelectRoadmapItemByID(m_xWizard->GetCurLevel()); } |