From d92bbcf2eef3d6ce18b0587175632aa283b413e2 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Mon, 20 Mar 2023 15:09:52 -0500 Subject: [PATCH] GUI: fix cur order out of bounds when undo/redo --- src/gui/editing.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/gui/editing.cpp b/src/gui/editing.cpp index 0d8341b28..77d76da24 100644 --- a/src/gui/editing.cpp +++ b/src/gui/editing.cpp @@ -1005,6 +1005,13 @@ void FurnaceGUI::doUndo() { break; } + if (curOrder>=e->curSubSong->ordersLen) { + curOrder=e->curSubSong->ordersLen-1; + oldOrder=curOrder; + oldOrder1=curOrder; + e->setOrder(curOrder); + } + undoHist.pop_back(); } @@ -1058,5 +1065,12 @@ void FurnaceGUI::doRedo() { break; } + if (curOrder>=e->curSubSong->ordersLen) { + curOrder=e->curSubSong->ordersLen-1; + oldOrder=curOrder; + oldOrder1=curOrder; + e->setOrder(curOrder); + } + redoHist.pop_back(); }