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

Fix crash when Esc key is pressed in drag-and-drop of frames in Timeline

Browse Source
This commit is contained in:
David Capello 2014-06-12 23:12:15 -03:00
parent 6924990992
commit 712d48245b
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/ui/timeline.cpp
View File

@ -771,6 +771,16 @@ bool Timeline::onProcessMessage(Message* msg)
case kKeyDownMessage: case kKeyDownMessage:
switch (static_cast<KeyMessage*>(msg)->scancode()) { switch (static_cast<KeyMessage*>(msg)->scancode()) {
case kKeyEsc:
if (m_state == STATE_STANDBY) {
m_range.disableRange();
invalidate();
}
else {
m_state = STATE_STANDBY;
}
break;
case kKeySpace: { case kKeySpace: {
setCursor(jmouse_x(0), jmouse_y(0)); setCursor(jmouse_x(0), jmouse_y(0));
return true; return true;
@ -781,11 +791,6 @@ bool Timeline::onProcessMessage(Message* msg)
case kKeyUpMessage: case kKeyUpMessage:
switch (static_cast<KeyMessage*>(msg)->scancode()) { switch (static_cast<KeyMessage*>(msg)->scancode()) {
case kKeyEsc:
m_range.disableRange();
invalidate();
break;
case kKeySpace: { case kKeySpace: {
// We have to clear all the KEY_SPACE in buffer. // We have to clear all the KEY_SPACE in buffer.
clear_keybuf(); clear_keybuf();
@ -1794,6 +1799,9 @@ void Timeline::dropRange(DropOp op)
if (op == Timeline::kMove && drop.layerBegin() == m_range.layerBegin()) if (op == Timeline::kMove && drop.layerBegin() == m_range.layerBegin())
return; return;
break; break;
default:
ASSERT(false && "You shouldn't call dropRange() if the range is disabled");
return;
} }
const char* undoLabel = NULL; const char* undoLabel = NULL;