From ba0b0b1bc9818611a255b95cd0f1123155cef9d3 Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Sun, 17 Jul 2016 22:42:32 -0400 Subject: [PATCH] Qt follow stream: don't clear the text widget when doing Save-As. ... Otherwise the user will see an empty stream after the Save-As operation. Change-Id: Ibafcb4e4b670807702a8d8a5756544471f2eccc3 Reviewed-on: https://code.wireshark.org/review/16521 Petri-Dish: Jeff Morriss Reviewed-by: Gerald Combs Reviewed-by: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- ui/qt/follow_stream_dialog.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp index fcabe0da09..5edfc6015e 100644 --- a/ui/qt/follow_stream_dialog.cpp +++ b/ui/qt/follow_stream_dialog.cpp @@ -410,7 +410,11 @@ void FollowStreamDialog::resetStream() frs_return_t FollowStreamDialog::readStream() { - ui->teStreamContent->clear(); + + // Only clear the display if we're going to refill it + if (save_as_ == false) + ui->teStreamContent->clear(); + truncated_ = false; frs_return_t ret; @@ -435,7 +439,10 @@ FollowStreamDialog::readStream() ret = (frs_return_t)0; break; } - ui->teStreamContent->moveCursor(QTextCursor::Start); + + if (save_as_ == false) + ui->teStreamContent->moveCursor(QTextCursor::Start); + return ret; }