[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 466e63ed692974c1b7529f22574538178e8928af
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Jul 12 16:59:46 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Jul 12 20:00:44 2020 +0200

    m_pEntry may be null
    
    Change-Id: I704ff31906437f0d998f3089cf1df43d29187e0d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98604
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 3a81302d515d..348cea8618e7 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -14549,7 +14549,9 @@ public:
 
     virtual bool has_focus() const override
     {
-        return gtk_widget_has_focus(m_pToggleButton) || gtk_widget_has_focus(m_pEntry) ||
+        if (m_pEntry && gtk_widget_has_focus(m_pEntry))
+            return true;
+        return gtk_widget_has_focus(m_pToggleButton) ||
                gtk_widget_has_focus(GTK_WIDGET(m_pOverlayButton)) ||
                gtk_widget_has_focus(GTK_WIDGET(m_pTreeView)) || GtkInstanceWidget::has_focus();
     }