aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/qt/rtp_analysis_dialog.cpp3
-rw-r--r--ui/qt/rtp_player_dialog.cpp2
-rw-r--r--ui/qt/rtp_stream_dialog.cpp6
3 files changed, 6 insertions, 5 deletions
diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp
index 553c07bde2..e30b9dd44c 100644
--- a/ui/qt/rtp_analysis_dialog.cpp
+++ b/ui/qt/rtp_analysis_dialog.cpp
@@ -513,8 +513,8 @@ void RtpAnalysisDialog::on_actionNextProblem_triggered()
QTreeWidgetItem *sel_ti = cur_tree->selectedItems()[0];
if (sel_ti->type() != rtp_analysis_type_) return;
QTreeWidgetItem *test_ti = cur_tree->itemBelow(sel_ti);
+ if (!test_ti) test_ti = cur_tree->topLevelItem(0);
while (test_ti != sel_ti) {
- if (!test_ti) test_ti = cur_tree->topLevelItem(0);
RtpAnalysisTreeWidgetItem *ra_ti = dynamic_cast<RtpAnalysisTreeWidgetItem *>((RtpAnalysisTreeWidgetItem *)test_ti);
if (!ra_ti->frameStatus()) {
cur_tree->setCurrentItem(ra_ti);
@@ -522,6 +522,7 @@ void RtpAnalysisDialog::on_actionNextProblem_triggered()
}
test_ti = cur_tree->itemBelow(test_ti);
+ if (!test_ti) test_ti = cur_tree->topLevelItem(0);
}
}
diff --git a/ui/qt/rtp_player_dialog.cpp b/ui/qt/rtp_player_dialog.cpp
index 896fabd22b..89f974bf9f 100644
--- a/ui/qt/rtp_player_dialog.cpp
+++ b/ui/qt/rtp_player_dialog.cpp
@@ -129,7 +129,7 @@ RtpPlayerDialog::RtpPlayerDialog(QWidget &parent, CaptureFile &cf) :
ctx_menu_->addSeparator();
ctx_menu_->addAction(ui->actionDragZoom);
ctx_menu_->addAction(ui->actionToggleTimeOrigin);
- ctx_menu_->addAction(ui->actionCrosshairs);
+// ctx_menu_->addAction(ui->actionCrosshairs);
connect(ui->audioPlot, SIGNAL(mouseMove(QMouseEvent*)),
this, SLOT(updateHintLabel()));
diff --git a/ui/qt/rtp_stream_dialog.cpp b/ui/qt/rtp_stream_dialog.cpp
index 4a7f7c01b6..3933cf401e 100644
--- a/ui/qt/rtp_stream_dialog.cpp
+++ b/ui/qt/rtp_stream_dialog.cpp
@@ -468,9 +468,9 @@ void RtpStreamDialog::on_actionAnalyze_triggered()
if (stream_a == NULL && stream_b == NULL) return;
- RtpAnalysisDialog rtp_analysis_dialog(*this, cap_file_, stream_a, stream_b);
- connect(&rtp_analysis_dialog, SIGNAL(goToPacket(int)), this, SIGNAL(goToPacket(int)));
- rtp_analysis_dialog.exec();
+ RtpAnalysisDialog *rtp_analysis_dialog = new RtpAnalysisDialog(*this, cap_file_, stream_a, stream_b);
+ connect(rtp_analysis_dialog, SIGNAL(goToPacket(int)), this, SIGNAL(goToPacket(int)));
+ rtp_analysis_dialog->show();
}
void RtpStreamDialog::on_actionCopyAsCsv_triggered()