osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Profile switching works when we have a capture file open so go ahead and 

enable it.

svn path=/trunk/; revision=46835
This commit is contained in:
Gerald Combs 2012-12-29 01:42:01 +00:00
parent 5bd252c44f
commit a562691080
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ui/qt/profile_dialog.cpp
View File

@ -231,7 +231,7 @@ void ProfileDialog::on_copyToolButton_clicked()
void ProfileDialog::on_buttonBox_accepted()
{
const gchar *err_msg;
// QTreeWidgetItem *item = pd_ui_->profileTreeWidget->currentItem();
QTreeWidgetItem *item = pd_ui_->profileTreeWidget->currentItem();
if ((err_msg = apply_profile_changes()) != NULL) {
QMessageBox::critical(this, tr("Profile Error"),
@ -240,17 +240,17 @@ void ProfileDialog::on_buttonBox_accepted()
return;
}
// if (item) {
// profile_def *profile = (profile_def *) item->data(0, Qt::UserRole).value<GList *>()->data;
// if (profile_exists (profile->name, FALSE) || profile_exists (profile->name, TRUE)) {
// /* The new profile exists, change */
// wsApp->setConfigurationProfile (profile->name);
// } else if (!profile_exists (get_profile_name(), FALSE)) {
// /* The new profile does not exist, and the previous profile has
// been deleted. Change to the default profile */
// wsApp->setConfigurationProfile (NULL);
// }
// }
if (item) {
profile_def *profile = (profile_def *) item->data(0, Qt::UserRole).value<GList *>()->data;
if (profile_exists (profile->name, FALSE) || profile_exists (profile->name, TRUE)) {
/* The new profile exists, change */
wsApp->setConfigurationProfile (profile->name);
} else if (!profile_exists (get_profile_name(), FALSE)) {
/* The new profile does not exist, and the previous profile has
been deleted. Change to the default profile */
wsApp->setConfigurationProfile (NULL);
}
}
}
void ProfileDialog::on_buttonBox_helpRequested()