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

[Caolán McNamara (via logerrit)]

 vcl/inc/salvtables.hxx   |    4 ++++
 vcl/unx/gtk3/gtkinst.cxx |    2 ++
 2 files changed, 6 insertions(+)

New commits:
commit 2ee09316dcd09caf5dd13894de484804d3464172
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jan 10 10:42:26 2023 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jan 10 19:57:17 2023 +0000

    Related: tdf#152950 assert if this arises anywhere else
    
    Change-Id: I29ff145c84fdd784c3b2fbd6e5860dcac42b597d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145262
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index d6968e36d00c..00bb670ffe54 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -734,6 +734,10 @@ public:
 
     virtual void set_active(int pos) override
     {
+        assert(m_xComboBox->IsUpdateMode()
+               && "don't set_active when frozen, set_active after thaw. Note 
selection doesn't "
+                  "survive a "
+                  "freeze");
         if (pos == -1)
         {
             m_xComboBox->SetNoSelection();
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 0525f8118531..09d2db890612 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -21571,6 +21571,8 @@ private:
 
     void set_active_including_mru(int pos, bool bInteractive)
     {
+        assert(gtk_tree_view_get_model(m_pTreeView) && "don't set_active when 
frozen, set_active after thaw. Note selection doesn't survive a freeze");
+
         disable_notify_events();
 
         tree_view_set_cursor(pos);