[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/gtk/gtksalmenu.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1d64946c073f5a244fd115ec1dfb3dcb09c9313d
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Jan 27 15:37:43 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jan 28 09:53:04 2019 +0100

    tdf#122990: return if no mpMenuBarContainerWidget in ApplyPersona
    
    Related to patches for tdf#122241
    
    Change-Id: I0ce46a3a362855aaa6c11f375d20c2212f1cb20b
    Reviewed-on: https://gerrit.libreoffice.org/66976
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 538cb0aa680d..27ba8096bce8 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -859,6 +859,8 @@ void GtkSalMenu::CreateMenuBarWidget()
 void GtkSalMenu::ApplyPersona()
 {
 #if GTK_CHECK_VERSION(3,0,0)
+    if (!mpMenuBarContainerWidget)
+        return;
     assert(mbMenuBar);
     // I'm dubious about the persona theming feature, but as it exists, lets try and support
     // it, apply the image to the mpMenuBarContainerWidget