Fixed crash introduced in "Allow 'group by sort' in multi-line view a…

…gain."

91/features/04-feature-multiline-tree-allow-grouping.patch

@@ -1,6 +1,6 @@
 # HG changeset patch
 # User Betterbird <betterbird@betterbird.eu>
-# Date 1640909365 -3600
+# Date 1640972233 -3600
 # Parent  b70f6940d9916817f0eedd4f9b9d7733c7d2dd71
 Feature: Multi-line tree follow-up: Allow "group by sort" again.
 
@@ -99,7 +99,7 @@ diff --git a/mail/base/content/threadPane.js b/mail/base/content/threadPane.js
 diff --git a/mailnews/base/src/nsMsgDBView.cpp b/mailnews/base/src/nsMsgDBView.cpp
 --- a/mailnews/base/src/nsMsgDBView.cpp
 +++ b/mailnews/base/src/nsMsgDBView.cpp
-@@ -2171,76 +2171,136 @@ nsMsgDBView::GetColspanTextProperties(in
+@@ -2171,76 +2171,135 @@ nsMsgDBView::GetColspanTextProperties(in
        break;
      }
    }
@@ -117,6 +117,7 @@ diff --git a/mailnews/base/src/nsMsgDBView.cpp b/mailnews/base/src/nsMsgDBView.c
    *isMulti =
        mozilla::Preferences::GetBool("mail.pane_config.multiline_all", false);
    if (*isMulti) {
++    if (!cols) return NS_OK;
      mIsMultiline = true;
 -    if (mTree) {
 -      RefPtr<nsTreeColumns> cols = mTree->GetColumns();
@@ -130,14 +131,13 @@ diff --git a/mailnews/base/src/nsMsgDBView.cpp b/mailnews/base/src/nsMsgDBView.c
 -            el->SetAttribute(u"hidden"_ns, u"true"_ns, rv1);
 -            break;
 -          }
-+    if (cols) {
-+      for (col = cols->GetFirstColumn(); col; col = col->GetNext()) {
-+        const nsAString& colID = col->GetId();
-+        if (colID.EqualsLiteral("subjectCol")) {
-+          el = col->Element();
-+          el->SetAttribute(u"hidden"_ns, u"true"_ns, rv1);
-+          break;
-         }
+-        }
++    for (col = cols->GetFirstColumn(); col; col = col->GetNext()) {
++      const nsAString& colID = col->GetId();
++      if (colID.EqualsLiteral("subjectCol")) {
++        el = col->Element();
++        el->SetAttribute(u"hidden"_ns, u"true"_ns, rv1);
++        break;
        }
      }
    } else {
@@ -148,8 +148,7 @@ diff --git a/mailnews/base/src/nsMsgDBView.cpp b/mailnews/base/src/nsMsgDBView.c
      // IsMultiline().
 -    if (!mTree) return NS_OK;
 -    RefPtr<nsTreeColumns> cols = mTree->GetColumns();
--    if (!cols) return NS_OK;
-+    if (!mTree || !cols) return NS_OK;
+     if (!cols) return NS_OK;
 
      // There are strange cases where we find no columns here, in this case
      // we use the previous result.