diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-01-19 15:23:29 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-01-20 02:26:05 +0000 |
| commit | 4ce3d7044e9ca772b685c1a1bf20087ad915b343 (patch) | |
| tree | 83ad1ca04363e179241629c0c9d52b903b15485d /ui | |
| parent | ed567e102ac3972a8b03b47ed65e7bf9237f5162 (diff) | |
| download | wireshark-4ce3d7044e9ca772b685c1a1bf20087ad915b343.tar.gz wireshark-4ce3d7044e9ca772b685c1a1bf20087ad915b343.tar.bz2 wireshark-4ce3d7044e9ca772b685c1a1bf20087ad915b343.zip | |
Qt: Fix a sequence dialog crash.
If gui.geom.SequenceDialog.maximized is TRUE, loadGeometry will trigger
a resize event, which will in turn call resetAxes. Call loadGeometry
after we've initialized our various QCustomPlot bits so that resetAxes
doesn't crash.
Bug: 13329
Change-Id: I4d27683fb3eee0a7c897800401bfa3869e97662b
Reviewed-on: https://code.wireshark.org/review/19684
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/sequence_dialog.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/qt/sequence_dialog.cpp b/ui/qt/sequence_dialog.cpp index d3335d3383..c5a596c5bd 100644 --- a/ui/qt/sequence_dialog.cpp +++ b/ui/qt/sequence_dialog.cpp @@ -77,7 +77,6 @@ SequenceDialog::SequenceDialog(QWidget &parent, CaptureFile &cf, SequenceInfo *i sequence_w_(1) { ui->setupUi(this); - loadGeometry(parent.width(), parent.height() * 4 / 5); QCustomPlot *sp = ui->sequencePlot; setWindowSubtitle(info_ ? tr("Call Flow") : tr("Flow")); @@ -177,6 +176,8 @@ SequenceDialog::SequenceDialog(QWidget &parent, CaptureFile &cf, SequenceInfo *i ProgressFrame::addToButtonBox(ui->buttonBox, &parent); + loadGeometry(parent.width(), parent.height() * 4 / 5); + connect(ui->horizontalScrollBar, SIGNAL(valueChanged(int)), this, SLOT(hScrollBarChanged(int))); connect(ui->verticalScrollBar, SIGNAL(valueChanged(int)), this, SLOT(vScrollBarChanged(int))); connect(sp->xAxis2, SIGNAL(rangeChanged(QCPRange)), this, SLOT(xAxisChanged(QCPRange))); |