osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Qt: Delete copied profile proper 

If a profile is a copy of another profile and get's deleted
without being saved, the original profile got deleted

Change-Id: Iffccb2e29131f97ad6fe71362946aad4e076eb3f
Reviewed-on: https://code.wireshark.org/review/34011
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
This commit is contained in:
Roland Knall 2019-07-18 23:06:59 +02:00
parent 0428638a24
commit 2ab4aa4423
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/qt/models/profile_model.cpp
View File

@ -141,8 +141,13 @@ GList * ProfileModel::entry(profile_def *ref) const
GList *fl_entry = edited_profile_list();
while (fl_entry && fl_entry->data) {
profile_def *profile = reinterpret_cast<profile_def *>(fl_entry->data);
if (strcmp(ref->reference, profile->reference) == 0 && ref->is_global == profile->is_global)
return fl_entry;
if (strcmp(ref->name, profile->name) == 0 && ref->is_global == profile->is_global)
{
if ( ( ref->reference == Q_NULLPTR && profile->reference == Q_NULLPTR )
|| ( ( ref->reference != Q_NULLPTR && profile->reference != Q_NULLPTR )
&& (strcmp(ref->reference, profile->reference) == 0) ) )
return fl_entry;
}
fl_entry = gxx_list_next(fl_entry);
}
@ -532,10 +537,11 @@ void ProfileModel::deleteEntry(QModelIndex idx)
else
{
GList * fl_entry = entry(prof);
emit beginRemoveRows(QModelIndex(), idx.row(), idx.row());
remove_from_profile_list(fl_entry);
emit endRemoveRows();
loadProfiles();
if ( fl_entry )
{
remove_from_profile_list(fl_entry);
loadProfiles();
}
}
}