diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-09-16 12:58:23 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-09-16 12:58:23 (GMT) |
| commit | af829b1eab194fd72ac101a880e32969cf1ae768 (patch) | |
| tree | af6a573125a755f1f783c746bd72991679d75737 /examples | |
| parent | 7769e7bf79f0c17a01874fa0b3f1b227c1e41e93 (diff) | |
| parent | b827e9329ec1ab9abb4e591f0b4c8349cf0d1e89 (diff) | |
| download | Qt-af829b1eab194fd72ac101a880e32969cf1ae768.zip Qt-af829b1eab194fd72ac101a880e32969cf1ae768.tar.gz Qt-af829b1eab194fd72ac101a880e32969cf1ae768.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/network/bearermonitor/sessionwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/network/bearermonitor/sessionwidget.cpp b/examples/network/bearermonitor/sessionwidget.cpp index ecc2a93..5ec9d53 100644 --- a/examples/network/bearermonitor/sessionwidget.cpp +++ b/examples/network/bearermonitor/sessionwidget.cpp @@ -107,7 +107,7 @@ void SessionWidget::updateSession() if (session->state() == QNetworkSession::Connected) statsTimer = startTimer(1000); - else + else if (statsTimer != -1) killTimer(statsTimer); if (session->configuration().type() == QNetworkConfiguration::InternetAccessPoint) |