diff options
| -rw-r--r-- | ui/qt/module_preferences_scroll_area.cpp | 2 | ||||
| -rw-r--r-- | ui/qt/preference_editor_frame.cpp | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/ui/qt/module_preferences_scroll_area.cpp b/ui/qt/module_preferences_scroll_area.cpp index aa84d766f7..4fabd71044 100644 --- a/ui/qt/module_preferences_scroll_area.cpp +++ b/ui/qt/module_preferences_scroll_area.cpp @@ -394,7 +394,7 @@ void ModulePreferencesScrollArea::uintLineEditTextEdited(const QString &new_str) if (!pref) return; bool ok; - uint new_uint = new_str.toUInt(&ok); + uint new_uint = new_str.toUInt(&ok, 0); if (ok) { pref->stashed_val.uint = new_uint; } diff --git a/ui/qt/preference_editor_frame.cpp b/ui/qt/preference_editor_frame.cpp index 3b15d605f2..5cba49d64f 100644 --- a/ui/qt/preference_editor_frame.cpp +++ b/ui/qt/preference_editor_frame.cpp @@ -33,6 +33,8 @@ #include "qt_ui_utils.h" +#include "wireshark_application.h" + #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) // Qt::escape #include <QTextDocument> @@ -45,7 +47,8 @@ PreferenceEditorFrame::PreferenceEditorFrame(QWidget *parent) : AccordionFrame(parent), ui(new Ui::PreferenceEditorFrame), module_(NULL), - pref_(NULL) + pref_(NULL), + new_range_(NULL) { ui->setupUi(this); } @@ -128,7 +131,7 @@ void PreferenceEditorFrame::uintLineEditTextEdited(const QString &new_str) } bool ok; - uint new_uint = new_str.toUInt(&ok); + uint new_uint = new_str.toUInt(&ok, 0); if (ok) { new_uint_ = new_uint; ui->preferenceLineEdit->setSyntaxState(SyntaxLineEdit::Valid); @@ -215,6 +218,11 @@ void PreferenceEditorFrame::on_okButton_clicked() } } on_cancelButton_clicked(); + // Emit signals once UI is hidden + if (apply) { + wsApp->emitAppSignal(WiresharkApplication::PacketDissectionChanged); + wsApp->emitAppSignal(WiresharkApplication::PreferencesChanged); + } } void PreferenceEditorFrame::on_cancelButton_clicked() |