fixes #4168 (IRC: list of channels displays topics in Channel column)

1 files changed, 38 insertions, 32 deletions

diff --git a/protocols/IRCG/src/channelList.cpp b/protocols/IRCG/src/channelList.cpp
index efd7c380d2..c2de0eaa10 100644
--- a/protocols/IRCG/src/channelList.cpp
+++ b/protocols/IRCG/src/channelList.cpp
@@ -177,41 +177,47 @@ public:
 					t = wcsstr(lvm.pszText, strFilterText);
 				}
 
-				if (t) {
-					++itemCount;
-
-					// Column 0
-					LVITEM lvItem;
-					lvItem.iItem = m_list2.GetItemCount();
-					lvItem.mask = LVIF_TEXT | LVIF_PARAM;
-
-					lvItem.iSubItem = 0;
-					lvItem.pszText = lvm.pszText;
-					lvItem.lParam = lvItem.iItem;
-					lvItem.iItem = m_list2.InsertItem(&lvItem);
-
-					// Column 2
-					lvm.mask = LVIF_TEXT;
-					lvm.iSubItem = 1;
-					lvm.iItem = i;
-					m_list.GetItem(&lvm);
+				if (!t)
+					continue;
 
-					lvItem.mask = LVIF_TEXT;
-					lvItem.iSubItem = 1;
-					lvItem.pszText = lvm.pszText;
-					m_list2.SetItem(&lvItem);
+				++itemCount;
 
-					// Column 4
-					lvm.mask = LVIF_TEXT;
-					lvm.iSubItem = 3;
-					lvm.iItem = i;
-					m_list.GetItem(&lvm);
+				// Column 0
+				LVITEM lvItem;
+				lvItem.iItem = m_list2.GetItemCount();
+				lvItem.mask = LVIF_TEXT | LVIF_PARAM;
 
-					lvItem.mask = LVIF_TEXT;
-					lvItem.pszText = lvm.pszText;
-					lvItem.iSubItem = 3;
-					m_list2.SetItem(&lvItem);
-				}
+				lvm.mask = LVIF_TEXT;
+				lvm.iSubItem = 0;
+				lvm.iItem = i;
+				m_list.GetItem(&lvm);
+
+				lvItem.iSubItem = 0;
+				lvItem.pszText = lvm.pszText;
+				lvItem.lParam = lvItem.iItem;
+				lvItem.iItem = m_list2.InsertItem(&lvItem);
+
+				// Column 2
+				lvm.mask = LVIF_TEXT;
+				lvm.iSubItem = 1;
+				lvm.iItem = i;
+				m_list.GetItem(&lvm);
+
+				lvItem.mask = LVIF_TEXT;
+				lvItem.iSubItem = 1;
+				lvItem.pszText = lvm.pszText;
+				m_list2.SetItem(&lvItem);
+
+				// Column 4
+				lvm.mask = LVIF_TEXT;
+				lvm.iSubItem = 3;
+				lvm.iItem = i;
+				m_list.GetItem(&lvm);
+
+				lvItem.mask = LVIF_TEXT;
+				lvItem.pszText = lvm.pszText;
+				lvItem.iSubItem = 3;
+				m_list2.SetItem(&lvItem);
 			}
 
 			// Show the list