From 1569217448c1e4c85ac44ecb20cf2f5b79978b72 Mon Sep 17 00:00:00 2001
From: Anders Broman <anders.broman@ericsson.com>
Date: Mon, 20 May 2013 05:33:18 +0000
Subject: From Cal Turney: When another profile is selected, its column.hidden
 preference is ignored.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8696

svn path=/trunk/; revision=49434
---
 epan/prefs.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'epan/prefs.c')

diff --git a/epan/prefs.c b/epan/prefs.c
index 2416437e75..3b9af18f0b 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -1315,13 +1315,15 @@ static prefs_set_pref_e column_hidden_set_cb(pref_t* pref, const gchar* value, g
     fmt_data    *cfmt;
     pref_t  *format_pref;
 
-    if (*pref->varp.string && (strcmp(*pref->varp.string, value) != 0)) {
-        *changed = TRUE;
-        g_free((void *)*pref->varp.string);
+    if (*pref->varp.string) { 
+        if (strcmp(*pref->varp.string, value) != 0) {
+            *changed = TRUE;
+            g_free((void *)*pref->varp.string);
+            *pref->varp.string = g_strdup(value);
+        }
+    } else if (value) {
         *pref->varp.string = g_strdup(value);
-    } else {
-        *pref->varp.string = NULL;
-    }
+    } 
 
     /*
      * Set the "visible" flag for the existing columns; we need to
-- 
cgit v1.2.3