From 322b12a5a4d96fe8c26f1db00de5c1d36ebed8bc Mon Sep 17 00:00:00 2001
From: KnugiHK <24708955+KnugiHK@users.noreply.github.com>
Date: Sat, 24 Jan 2026 18:02:30 +0800
Subject: [PATCH] Fix a crash in message counting if chat filter is in use

---
 Whatsapp_Chat_Exporter/android_handler.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Whatsapp_Chat_Exporter/android_handler.py b/Whatsapp_Chat_Exporter/android_handler.py
index 59cb2b6..827e8bd 100644
--- a/Whatsapp_Chat_Exporter/android_handler.py
+++ b/Whatsapp_Chat_Exporter/android_handler.py
@@ -142,6 +142,8 @@ def _get_message_count(cursor, filter_empty, filter_date, filter_chat, jid_map_e
                       FROM message
                         LEFT JOIN chat
                             ON chat._id = message.chat_row_id
+                        INNER JOIN jid
+                            ON jid._id = chat.jid_row_id
                         INNER JOIN jid jid_global
                             ON jid_global._id = chat.jid_row_id
                         LEFT JOIN jid jid_group