diff options
Diffstat (limited to 'src/corelib/io/qiodevice.cpp')
| -rw-r--r-- | src/corelib/io/qiodevice.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index c80c78bd3b..3b1cd196d2 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -1289,6 +1289,7 @@ qint64 QIODevice::write(const char *data, qint64 maxSize) const char *startOfBlock = data; qint64 writtenSoFar = 0; + const qint64 savedPos = d->pos; forever { const char *endOfBlock = startOfBlock; @@ -1300,7 +1301,7 @@ qint64 QIODevice::write(const char *data, qint64 maxSize) qint64 ret = writeData(startOfBlock, blockSize); if (ret <= 0) { if (writtenSoFar && !sequential) - d->buffer.skip(writtenSoFar); + d->buffer.skip(d->pos - savedPos); return writtenSoFar ? writtenSoFar : ret; } if (!sequential) { @@ -1316,7 +1317,7 @@ qint64 QIODevice::write(const char *data, qint64 maxSize) qint64 ret = writeData("\r\n", 2); if (ret <= 0) { if (writtenSoFar && !sequential) - d->buffer.skip(writtenSoFar); + d->buffer.skip(d->pos - savedPos); return writtenSoFar ? writtenSoFar : ret; } if (!sequential) { @@ -1329,7 +1330,7 @@ qint64 QIODevice::write(const char *data, qint64 maxSize) } if (writtenSoFar && !sequential) - d->buffer.skip(writtenSoFar); + d->buffer.skip(d->pos - savedPos); return writtenSoFar; } #endif |