Merge branch 'opentoonz:master' into update_vcpkg_libraries

Funinja · Dec 6, 2023 · 4c4f2ac · 4c4f2ac
2 parents 1eaaad5 + 261c423
commit 4c4f2ac
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
@@ -934,8 +934,13 @@ Room *MainWindow::getCurrentRoom() const {
 //-----------------------------------------------------------------------------
 
 void MainWindow::onUndo() {
-  bool ret = TUndoManager::manager()->undo();
-  if (!ret) DVGui::error(QObject::tr("No more Undo operations available."));
+  ToolHandle *toolH = TApp::instance()->getCurrentTool();
+
+  // do not use undo if tool is currently in use
+  if (!toolH->isToolBusy()) {
+    bool ret = TUndoManager::manager()->undo();
+    if (!ret) DVGui::error(QObject::tr("No more Undo operations available."));
+  }
 }
 
 //-----------------------------------------------------------------------------