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

Detect scripts that modify a sprite when we are undoing/redoing

Browse Source
This commit is contained in:
David Capello 2023-02-09 07:43:33 -03:00
parent 67bb8f49ea
commit 57e43c76b8
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/doc_undo.cpp
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2022 Igara Studio S.A.
// Copyright (C) 2022-2023 Igara Studio S.A.
// Copyright (C) 2001-2018 David Capello
//
// This program is distributed under the terms of
@ -14,10 +14,12 @@
#include "app/app.h"
#include "app/cmd.h"
#include "app/cmd_transaction.h"
#include "app/console.h"
#include "app/context.h"
#include "app/doc_undo_observer.h"
#include "app/pref/preferences.h"
#include "base/mem_utils.h"
#include "base/scoped_value.h"
#include "undo/undo_history.h"
#include "undo/undo_state.h"
@ -42,6 +44,11 @@ void DocUndo::setContext(Context* ctx)
void DocUndo::add(CmdTransaction* cmd)
{
ASSERT(cmd);
if (m_undoing) {
Console(m_ctx).printf("Error running scripts: Adding undo information when navigating undo history");
}
UNDO_TRACE("UNDO: Add state <%s> of %s to %s\n",
cmd->label().c_str(),
base::get_pretty_memory_size(cmd->memSize()).c_str(),
@ -96,6 +103,8 @@ bool DocUndo::canRedo() const
void DocUndo::undo()
{
ASSERT(!m_undoing);
base::ScopedValue undoing(m_undoing, true, false);
const size_t oldSize = m_totalUndoSize;
{
const undo::UndoState* state = nextUndo();
@ -116,6 +125,8 @@ void DocUndo::undo()
void DocUndo::redo()
{
ASSERT(!m_undoing);
base::ScopedValue undoing(m_undoing, true, false);
const size_t oldSize = m_totalUndoSize;
{
const undo::UndoState* state = nextRedo();

6
src/app/doc_undo.h
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2022 Igara Studio S.A.
// Copyright (C) 2022-2023 Igara Studio S.A.
// Copyright (C) 2001-2018 David Capello
//
// This program is distributed under the terms of
@ -100,6 +100,10 @@ namespace app {
Context* m_ctx = nullptr;
size_t m_totalUndoSize = 0;
// True when we are undoing/redoing. Used to avoid adding new undo
// information when we are moving through the undo history.
bool m_undoing = false;
// True if the saved state was invalidated/corrupted/lost in some
// way. E.g. If the save process fails.
bool m_savedStateIsLost = false;