[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/window/menu.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b9de0b5d94a155ccd43e28841064e7c1b1f9ab1d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Mar 23 14:55:09 2021 +0000
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Tue Mar 30 11:17:13 2021 +0200

    Related: tdf#141197 critical a11y warning
    
    ** (soffice:19098): CRITICAL **: 13:44:40.365:
    AtkObject* atk_object_wrapper_ref(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>&, bool):
    assertion 'bool(rxAccessible)' failed
    
    probably since...
    
    commit cbc18cc904c652a936c4b68fba4d975bd89b5abd
    Date:   Mon Nov 23 21:03:28 2020 +0100
    
        tdf#138425 vcl/gtk activate main menu in UpdateFull
    
    Change-Id: Ieb181e02bb0d2a907aec8534349ec2a80fd9c7e3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112957
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 7d4a34678ada..792f3aed5ff5 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1302,7 +1302,7 @@ css::uno::Reference<css::accessibility::XAccessible> Menu::GetAccessible()
     // Since PopupMenu are sometimes shared by different instances of MenuBar, the mxAccessible member gets
     // overwritten and may contain a disposed object when the initial menubar gets set again. So use the
     // mxAccessible member only for sub menus.
-    if ( pStartedFrom )
+    if (pStartedFrom && pStartedFrom != this)
     {
         for ( sal_uInt16 i = 0, nCount = pStartedFrom->GetItemCount(); i < nCount; ++i )
         {