diff options
author | 2009-07-28 18:24:51 -0700 | |
---|---|---|
committer | 2009-07-29 12:05:36 -0700 | |
commit | c1d7a6ec1e8058135f1058d93811dff55e331276 (patch) | |
tree | 428ed0899ff07bccdad590fac6fb76f368815737 | |
parent | 05ad423fdd9b413a690c889cad9012059748c2a4 (diff) |
Only restore the bits for wallpapers that aren't built in.
-rw-r--r-- | libs/utils/BackupData.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libs/utils/BackupData.cpp b/libs/utils/BackupData.cpp index c51d989b4c..0cef35aed5 100644 --- a/libs/utils/BackupData.cpp +++ b/libs/utils/BackupData.cpp @@ -193,6 +193,7 @@ BackupDataReader::Status() if ((actual) != (expected)) { \ if ((actual) == 0) { \ m_status = EIO; \ + m_done = true; \ } else { \ m_status = errno; \ } \ @@ -222,7 +223,7 @@ BackupDataReader::ReadNextHeader(bool* done, int* type) amt = skip_padding(); if (amt == EIO) { - *done = true; + *done = m_done = true; return NO_ERROR; } else if (amt != NO_ERROR) { @@ -338,6 +339,10 @@ BackupDataReader::ReadEntityData(void* data, size_t size) m_status = errno; return -1; } + if (amt == 0) { + m_status = EIO; + m_done = true; + } m_pos += amt; return amt; } |