mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-07 09:56:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix invalid behavior when ImportSpriteSheet's "Import" button is pressed without a document

Browse Source
This commit is contained in:
David Capello 2015-05-28 20:19:35 -03:00
parent 1124c5caab
commit 217a3c51c6
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/commands/cmd_import_sprite_sheet.cpp
View File

@ -52,6 +52,8 @@ public:
, m_editor(NULL)
, m_fileOpened(false)
, m_docPref(nullptr) {
import()->setEnabled(false);
x()->EntryChange.connect(Bind<void>(&ImportSpriteSheetWindow::onEntriesChange, this));
y()->EntryChange.connect(Bind<void>(&ImportSpriteSheetWindow::onEntriesChange, this));
width()->EntryChange.connect(Bind<void>(&ImportSpriteSheetWindow::onEntriesChange, this));
@ -180,6 +182,8 @@ private:
captureEditor();
import()->setEnabled(m_document ? true: false);
if (m_document) {
m_docPref = &Preferences::instance().document(m_document);
@ -241,7 +245,6 @@ void ImportSpriteSheetCommand::onExecute(Context* context)
{
ImportSpriteSheetWindow window(context);
retry:;
window.openWindowInForeground();
if (!window.ok())
return;
@ -250,11 +253,9 @@ retry:;
DocumentPreferences* docPref = window.docPref();
gfx::Rect frameBounds = window.frameBounds();
// The user don't select a sheet yet.
if (!document) {
Alert::show("Import Sprite Sheet<<Select a sprite first.||&Close");
goto retry;
}
ASSERT(document);
if (!document)
return;
// The list of frames imported from the sheet
std::vector<ImageRef> animation;