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

[Caolán McNamara]

 vcl/source/control/lstbox.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 583207377705dea2bfe09db3e33d7947c473d862
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 13 16:32:43 2016 +0100

    Related: rhbz#1343766 a11y queries during dispose trigger listbox crashes
    
    though not able to reproduce, I have an in-house complaint similar to
    
    commit f120abb446bf3f5230ed06a3b148654dde36bb94
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Wed Jun 8 11:35:15 2016 +0100
    
        Resolves: rhbz#1343766 a11y queries during dispose trigger combobox crashes
    
    except with a listbox in the bt
    
    (cherry picked from commit c615943bda57eadfa73c14a7314938aabe0bd16f)
    
    Change-Id: Id31561e009a1f0ec9272a0e7216296e4017e5688
    Reviewed-on: https://gerrit.libreoffice.org/27189
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index e15d09e..121e2c0 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -1208,6 +1208,8 @@ void ListBox::EnableMultiSelection( bool bMulti, bool bStackSelection )
 
 bool ListBox::IsMultiSelectionEnabled() const
 {
+    if (!mpImplLB)
+        return false;
     return mpImplLB->IsMultiSelectionEnabled();
 }