mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-06 06:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue restoring sprite user data color from data recovery sessions

Browse Source
This commit is contained in:
David Capello 2021-05-18 15:22:28 -03:00
parent fe1d96ed0e
commit 8b6aa2945f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/crash/read_document.cpp
View File

@ -1,5 +1,5 @@
// Aseprite // Aseprite
// Copyright (C) 2018-2020 Igara Studio S.A. // Copyright (C) 2018-2021 Igara Studio S.A.
// Copyright (C) 2001-2018 David Capello // Copyright (C) 2001-2018 David Capello
// //
// This program is distributed under the terms of // This program is distributed under the terms of
@ -394,7 +394,14 @@ private:
UserData readUserData(std::ifstream& s) { UserData readUserData(std::ifstream& s) {
UserData userData; UserData userData;
userData.setText(read_string(s)); userData.setText(read_string(s));
userData.setColor(read32(s)); // This check is here because we've been restoring sprites from
// old sessions where the color is restored incorrectly if we
// don't check if there is enough space to read from the file
// (e.g. reading a random color or just white, maybe -1 which is
// 0xffffffff in 32-bit).
if (!s.eof()) {
userData.setColor(read32(s));
}
return userData; return userData;
} }