diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-02-13 16:18:57 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-14 00:19:58 +0000 |
| commit | b5a3b65f7aefa7af82f6d4927de91f151d209b3c (patch) | |
| tree | beed86ba522ce101884a84dd68ea3b79a70c32af /ui/qt/voip_calls_dialog.cpp | |
| parent | f85d1c801d0fd49950a13bf134102ff04582f17d (diff) | |
Qt: Fix side effects of recent WiresharkDialog changes.
Quit the application when the main window closes. This cleans up any
other top-level windows that might be open.
Don't dereference a NULL pointer when opening the sequence dialog from
the VoIP calls dialog.
Change-Id: I9902d40ead1c5f2e541b6d79f3d957228e4e9687
Reviewed-on: https://code.wireshark.org/review/7107
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/voip_calls_dialog.cpp')
| -rw-r--r-- | ui/qt/voip_calls_dialog.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/qt/voip_calls_dialog.cpp b/ui/qt/voip_calls_dialog.cpp index c32acde626..e520b6707c 100644 --- a/ui/qt/voip_calls_dialog.cpp +++ b/ui/qt/voip_calls_dialog.cpp @@ -160,7 +160,8 @@ public: VoipCallsDialog::VoipCallsDialog(QWidget &parent, CaptureFile &cf, bool all_flows) : WiresharkDialog(parent, cf), - ui(new Ui::VoipCallsDialog) + ui(new Ui::VoipCallsDialog), + parent_(parent) { ui->setupUi(this); ui->callTreeWidget->sortByColumn(start_time_col_, Qt::AscendingOrder); @@ -450,7 +451,7 @@ void VoipCallsDialog::showSequence() cur_ga_item = g_list_next(cur_ga_item); } - SequenceDialog *sequence_dialog = new SequenceDialog(*parentWidget(), cap_file_, tapinfo_.graph_analysis); + SequenceDialog *sequence_dialog = new SequenceDialog(parent_, cap_file_, tapinfo_.graph_analysis); // XXX This goes away when we close the VoIP Calls dialog. connect(sequence_dialog, SIGNAL(goToPacket(int)), this, SIGNAL(goToPacket(int))); |