mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-14 13:21:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid crash loading old themes without <style> information

Browse Source
This commit is contained in:
David Capello 2017-06-29 15:26:18 -03:00
parent a92f476e3a
commit 7072ecebe3
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/app/ui/skin/skin_theme.cpp
View File

@ -219,6 +219,9 @@ void SkinTheme::onRegenerate()
catch (const std::exception& e) {
LOG("THEME: Error loading user-theme: %s\n", e.what());
// Load default theme again
loadAll(pref.theme.selected.defaultValue());
if (ui::get_theme())
Console::showException(e);
@ -271,18 +274,30 @@ void SkinTheme::loadSheet()
{
// Load the skin sheet
std::string sheet_filename(base::join_path(m_path, "sheet.png"));
she::Surface* newSheet = nullptr;
try {
if (m_sheet) {
m_sheet->dispose();
m_sheet = nullptr;
}
m_sheet = she::instance()->loadRgbaSurface(sheet_filename.c_str());
if (m_sheet)
m_sheet->applyScale(guiscale());
newSheet = she::instance()->loadRgbaSurface(sheet_filename.c_str());
}
catch (...) {
throw base::Exception("Error loading %s file", sheet_filename.c_str());
}
// Replace the sprite sheet
if (m_sheet) {
m_sheet->dispose();
m_sheet = nullptr;
}
m_sheet = newSheet;
if (m_sheet)
m_sheet->applyScale(guiscale());
// Change sprite sheet of all layer styles
for (auto it : m_styles) {
for (auto layer : it.second->layers()) {
if (layer.spriteSheet())
layer.setSpriteSheet(m_sheet);
}
}
}
void SkinTheme::loadXml()
@ -453,6 +468,10 @@ void SkinTheme::loadXml()
.FirstChild("theme")
.FirstChild("styles")
.FirstChild("style").ToElement();
if (!xmlStyle) // Without styles?
throw base::Exception("There are no styles");
while (xmlStyle) {
const char* style_id = xmlStyle->Attribute("id");
if (!style_id) {