vcl/source/app/salvtables.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 6a6c6b9242b699b993acb2eeead609cb4faa862d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Apr 7 11:22:52 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Apr 7 14:14:33 2020 +0200
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/+/91809
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 14dab888e080..706a874229e6 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1853,8 +1853,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());
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
