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

Fix --trim and --save-as when allow non-linear history is enabled

Browse Source
This commit is contained in:
David Capello 2015-02-03 11:05:33 -03:00
parent 0aedc7c74e
commit 715b3fc9d8
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/app.cpp
View File

@ -33,6 +33,7 @@
#include "app/data_recovery.h"
#include "app/document_exporter.h"
#include "app/document_location.h"
#include "app/document_undo.h"
#include "app/file/file.h"
#include "app/file/file_formats_manager.h"
#include "app/file/palette_file.h"
@ -335,8 +336,13 @@ void App::initialize(const AppOptions& options)
params.set("filename-format", fmt.c_str());
ctx->executeCommand(saveAsCommand, &params);
if (trim) // Undo trim command
if (trim) { // Undo trim command
ctx->executeCommand(undoCommand);
// Just in case allow non-linear history is enabled
// we clear redo information
doc->undoHistory()->clearRedo();
}
}
}
else {
@ -357,8 +363,13 @@ void App::initialize(const AppOptions& options)
params.set("filename-format", format.c_str());
ctx->executeCommand(saveAsCommand, &params);
if (trim) // Undo trim command
if (trim) { // Undo trim command
ctx->executeCommand(undoCommand);
// Just in case allow non-linear history is enabled
// we clear redo information
doc->undoHistory()->clearRedo();
}
}
}
}