From 2729a8935351417649f3d27f94ab2e38d8080cef Mon Sep 17 00:00:00 2001 From: Roland Knall Date: Mon, 26 Aug 2019 11:12:07 +0200 Subject: Qt: Fix copy from default profile The default profile was available to be selected, even if it was the active profile. Bug: 16021 Change-Id: If08a563f243f18f32e17cb2169180ec0b1274a9a Reviewed-on: https://code.wireshark.org/review/34366 Petri-Dish: Roland Knall Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall --- ui/qt/models/profile_model.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/qt/models/profile_model.cpp b/ui/qt/models/profile_model.cpp index 979f0ae38b..faac93866a 100644 --- a/ui/qt/models/profile_model.cpp +++ b/ui/qt/models/profile_model.cpp @@ -887,7 +887,7 @@ QModelIndex ProfileModel::activeProfile() const if ( prof->is_global || checkDuplicate(index(row, ProfileModel::COL_NAME) ) ) return QModelIndex(); - if ( ( set_profile_.compare(prof->name) == 0 && prof->status == PROF_STAT_EXISTS ) || + if ( ( set_profile_.compare(prof->name) == 0 && ( prof->status == PROF_STAT_EXISTS || prof->status == PROF_STAT_DEFAULT ) ) || ( set_profile_.compare(prof->reference) == 0 && prof->status == PROF_STAT_CHANGED ) ) return index(row, ProfileModel::COL_NAME); } -- cgit v1.2.3