Fix bug where changing the "show / hide offline contacts" option while on the call history, would replace the call history with contacts

13 years ago · 58acfca5dd
parent 6be8af5781
commit 58acfca5dd
1 changed files with 9 additions and 3 deletions
--- a/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java
@ -211,9 +211,15 @@ else if (itemName.equals("showHideOffline"))

            TreeContactList.presenceFilter.setShowOffline(!isShowOffline);

-            GuiActivator.getContactList()
-                .setDefaultFilter(TreeContactList.presenceFilter);
-            GuiActivator.getContactList().applyDefaultFilter();
+            // Only re-apply the filter if the presence filter is showing.
+            // Otherwise we might end up with contacts in the call history
+            if (GuiActivator.getContactList().getDefaultFilter() ==
+                    TreeContactList.presenceFilter)
+            {
+                GuiActivator.getContactList()
+                    .setDefaultFilter(TreeContactList.presenceFilter);
+                GuiActivator.getContactList().applyDefaultFilter();
+            }

            String itemTextKey = !isShowOffline
                    ? "service.gui.HIDE_OFFLINE_CONTACTS"