From 165c8b04227df05a0ae329e92adff7bd314b9d4b Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Wed, 4 Jan 2017 10:57:25 -0500 Subject: Refactor range preference. Refactored so that all handling of ranges in struct preference can be internal to prefs.c Change-Id: I68577909f9c07b23a16ab3443a523355d4645314 Reviewed-on: https://code.wireshark.org/review/19577 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- ui/qt/preference_editor_frame.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'ui/qt/preference_editor_frame.cpp') diff --git a/ui/qt/preference_editor_frame.cpp b/ui/qt/preference_editor_frame.cpp index 845920680e..fa08823f7c 100644 --- a/ui/qt/preference_editor_frame.cpp +++ b/ui/qt/preference_editor_frame.cpp @@ -109,7 +109,7 @@ void PreferenceEditorFrame::editPreference(preference *pref, pref_module *module break; case PREF_RANGE: wmem_free(NULL, new_range_); - new_range_ = range_copy(NULL, pref->stashed_val.range); + new_range_ = range_copy(NULL, prefs_get_stashed_range(pref)); connect(ui->preferenceLineEdit, SIGNAL(textEdited(QString)), this, SLOT(rangeLineEditTextEdited(QString))); show = true; @@ -203,11 +203,7 @@ void PreferenceEditorFrame::on_buttonBox_accepted() } break; case PREF_RANGE: - if (!ranges_are_equal(pref_->stashed_val.range, new_range_)) { - wmem_free(wmem_epan_scope(), pref_->stashed_val.range); - pref_->stashed_val.range = range_copy(wmem_epan_scope(), new_range_); - apply = true; - } + apply = prefs_set_stashed_range(pref_, new_range_); break; default: break; -- cgit v1.2.3