Merge pull request #4805 from dogmaphobic/tileReply

Stop timeout when closing tile reply.

Merge pull request #4805 from dogmaphobic/tileReply
Stop timeout when closing tile reply.
2f1e631c · Gus Grubba · GitHub · 673816a6 · f0007592 · 2f1e631c
Commit 2f1e631c authored Mar 20, 2017 by Gus Grubba Committed by GitHub Mar 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

QGeoMapReplyQGC.cpp src/QtLocationPlugin/QGeoMapReplyQGC.cpp +2 -0

No files found.
--- a/src/QtLocationPlugin/QGeoMapReplyQGC.cpp
+++ b/src/QtLocationPlugin/QGeoMapReplyQGC.cpp
@@ -81,6 +81,7 @@ QGeoTiledMapReplyQGC::~QGeoTiledMapReplyQGC()
 void
 QGeoTiledMapReplyQGC::_clearReply()
 {
+    _timer.stop();
    if (_reply) {
        _reply->deleteLater();
        _reply = 0;
@@ -107,6 +108,7 @@ QGeoTiledMapReplyQGC::_returnBadTile()
 void
 QGeoTiledMapReplyQGC::abort()
 {
+    _timer.stop();
    if (_reply)
        _reply->abort();
 }