osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Initialize a variable so that we can quit. Remove some debugging 

statements.

svn path=/trunk/; revision=44715
This commit is contained in:
Gerald Combs 2012-08-31 22:50:44 +00:00
parent 5c715fcc19
commit d6ce6168bb
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/qt/interface_tree.cpp
View File

@ -123,7 +123,6 @@ InterfaceTree::~InterfaceTree() {
void InterfaceTree::hideEvent(QHideEvent *evt) {
Q_UNUSED(evt);
qDebug() << "==== stat cache stop";
stat_timer_->stop();
if (stat_cache_) {
capture_stat_stop(stat_cache_);
@ -145,7 +144,6 @@ void InterfaceTree::updateStatistics(void) {
if (!stat_cache_) {
// Start gathering statistics using dumpcap
// We crash (on OS X at least) if we try to do this from ::showEvent.
qDebug() << "==== stat cache start";
stat_cache_ = capture_stat_start(&global_capture_opts);
}
if (!stat_cache_) return;

5
ui/qt/main_window.cpp
View File

@ -77,6 +77,7 @@ MainWindow::MainWindow(QWidget *parent) :
main_ui_(new Ui::MainWindow),
df_combo_box_(new DisplayFilterCombo()),
cap_file_(NULL),
capture_stopping_(false),
previous_focus_(NULL),
#ifdef _WIN32
pipe_timer_(NULL)
@ -307,11 +308,11 @@ void MainWindow::keyPressEvent(QKeyEvent *event) {
}
void MainWindow::closeEvent(QCloseEvent *event) {
Q_UNUSED(event);
/* If we're in the middle of stopping a capture, don't do anything;
the user can try deleting the window after the capture stops. */
if (capture_stopping_)
if (capture_stopping_) {
event->ignore();
}
}
void MainWindow::openCaptureFile(QString &cfPath)