From 58acfca5dd8be76daa18085b96aeb860e2c9824f Mon Sep 17 00:00:00 2001
From: Tom Denham <tom@tomdee.co.uk>
Date: Tue, 12 Feb 2013 13:40:58 +0000
Subject: [PATCH] Fix bug where changing the "show / hide offline contacts"
 option while on the call history, would replace the call history with
 contacts

---
 .../communicator/impl/gui/main/menus/ToolsMenu.java  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java
index 648dcc3a7..a6b08b915 100644
--- 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"