mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-01 19:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes in Export Sprite Sheet

Browse Source
This commit is contained in:
David Capello 2019-10-29 10:34:03 -03:00
parent 9461c5d02c
commit 31efa1ce0f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/commands/cmd_export_sprite_sheet.cpp
View File

@ -448,7 +448,10 @@ public:
~ExportSpriteSheetWindow() { ~ExportSpriteSheetWindow() {
cancelGenTask(); cancelGenTask();
if (m_spriteSheet) { if (m_spriteSheet) {
DocDestroyer destroyer(UIContext::instance(), m_spriteSheet.release(), 100); auto ctx = UIContext::instance();
ctx->setActiveDocument(m_site.document());
DocDestroyer destroyer(ctx, m_spriteSheet.release(), 100);
destroyer.destroyDocument(); destroyer.destroyDocument();
} }
} }
@ -876,11 +879,11 @@ private:
if (!preview()->isSelected()) { if (!preview()->isSelected()) {
if (m_spriteSheet) { if (m_spriteSheet) {
auto ctx = UIContext::instance(); auto ctx = UIContext::instance();
ctx->setActiveDocument(m_site.document());
DocDestroyer destroyer(ctx, m_spriteSheet.release(), 100); DocDestroyer destroyer(ctx, m_spriteSheet.release(), 100);
destroyer.destroyDocument(); destroyer.destroyDocument();
m_editor = nullptr; m_editor = nullptr;
ctx->setActiveDocument(m_site.document());
} }
return; return;
} }
@ -1219,6 +1222,8 @@ void ExportSpriteSheetCommand::onExecute(Context* context)
job.waitJob(); job.waitJob();
newDocument = job.releaseDoc(); newDocument = job.releaseDoc();
if (!newDocument)
return;
StatusBar* statusbar = StatusBar::instance(); StatusBar* statusbar = StatusBar::instance();
if (statusbar) if (statusbar)
@ -1242,11 +1247,13 @@ void ExportSpriteSheetCommand::onExecute(Context* context)
return; return;
} }
ASSERT(newDocument);
if (params.openGenerated()) { if (params.openGenerated()) {
newDocument->setContext(context); newDocument->setContext(context);
newDocument.release(); newDocument.release();
} }
else if (newDocument) { else {
DocDestroyer destroyer(context, newDocument.release(), 100); DocDestroyer destroyer(context, newDocument.release(), 100);
destroyer.destroyDocument(); destroyer.destroyDocument();
} }