From c3643462944d4326368c09036271aeac0484efa5 Mon Sep 17 00:00:00 2001
From: manongjohn <manongjohn@users.noreply.github.com>
Date: Sun, 10 Apr 2022 12:21:41 -0400
Subject: [PATCH] Fix column renaming when editing frame

---
 toonz/sources/tnztools/fullcolorbrushtool.cpp   | 5 +++--
 toonz/sources/tnztools/geometrictool.cpp        | 5 +++--
 toonz/sources/tnztools/toonzrasterbrushtool.cpp | 5 +++--
 toonz/sources/tnztools/toonzvectorbrushtool.cpp | 5 +++--
 toonz/sources/tnztools/typetool.cpp             | 5 +++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/toonz/sources/tnztools/fullcolorbrushtool.cpp b/toonz/sources/tnztools/fullcolorbrushtool.cpp
index 530cfc8b..96695280 100644
--- a/toonz/sources/tnztools/fullcolorbrushtool.cpp
+++ b/toonz/sources/tnztools/fullcolorbrushtool.cpp
@@ -659,7 +659,8 @@ void FullColorBrushTool::leftButtonUp(const TPointD &pos,
   if (m_tileSet->getTileCount() > 0) {
     delete m_tileSaver;
     bool isEditingLevel = m_application->getCurrentFrame()->isEditingLevel();
-    if (!isEditingLevel) TUndoManager::manager()->beginBlock();
+    bool renameColumn   = m_isFrameCreated;
+    if (!isEditingLevel && renameColumn) TUndoManager::manager()->beginBlock();
     TTool::Application *app   = TTool::getApplication();
     TXshLevel *level          = app->getCurrentLevel()->getLevel();
     TXshSimpleLevelP simLevel = level->getSimpleLevel();
@@ -670,7 +671,7 @@ void FullColorBrushTool::leftButtonUp(const TPointD &pos,
         m_strokeRect.getP00()));
 
     // Column name renamed to level name only if was originally empty
-    if (!isEditingLevel) {
+    if (!isEditingLevel && renameColumn) {
       int col            = app->getCurrentColumn()->getColumnIndex();
       TXshColumn *column = app->getCurrentXsheet()->getXsheet()->getColumn(col);
       int r0, r1;
diff --git a/toonz/sources/tnztools/geometrictool.cpp b/toonz/sources/tnztools/geometrictool.cpp
index 9264001a..16192962 100644
--- a/toonz/sources/tnztools/geometrictool.cpp
+++ b/toonz/sources/tnztools/geometrictool.cpp
@@ -1260,12 +1260,13 @@ public:
     if (!m_active) return;
 
     bool isEditingLevel = m_application->getCurrentFrame()->isEditingLevel();
-    if (!isEditingLevel) TUndoManager::manager()->beginBlock();
+    bool renameColumn   = m_isFrameCreated;
+    if (!isEditingLevel && renameColumn) TUndoManager::manager()->beginBlock();
 
     if (m_primitive) m_primitive->leftButtonUp(p, e);
 
     // Column name renamed to level name only if was originally empty
-    if (!isEditingLevel) {
+    if (!isEditingLevel && renameColumn) {
       int col = m_application->getCurrentColumn()->getColumnIndex();
       TXshColumn *column =
           m_application->getCurrentXsheet()->getXsheet()->getColumn(col);
diff --git a/toonz/sources/tnztools/toonzrasterbrushtool.cpp b/toonz/sources/tnztools/toonzrasterbrushtool.cpp
index d7477038..3ebab79c 100644
--- a/toonz/sources/tnztools/toonzrasterbrushtool.cpp
+++ b/toonz/sources/tnztools/toonzrasterbrushtool.cpp
@@ -1861,7 +1861,8 @@ void ToonzRasterBrushTool::finishRasterBrush(const TPointD &pos,
   TXshSimpleLevelP simLevel = level->getSimpleLevel();
 
   bool isEditingLevel = m_application->getCurrentFrame()->isEditingLevel();
-  if (!isEditingLevel) TUndoManager::manager()->beginBlock();
+  bool renameColumn   = m_isFrameCreated;
+  if (!isEditingLevel && renameColumn) TUndoManager::manager()->beginBlock();
 
   /*--
    * 描画中にカレントフレームが変わっても、描画開始時のFidに対してUndoを記録する
@@ -2087,7 +2088,7 @@ void ToonzRasterBrushTool::finishRasterBrush(const TPointD &pos,
   }
 
   // Column name renamed to level name only if was originally empty
-  if (!isEditingLevel) {
+  if (!isEditingLevel && renameColumn) {
     int col            = app->getCurrentColumn()->getColumnIndex();
     TXshColumn *column = app->getCurrentXsheet()->getXsheet()->getColumn(col);
     int r0, r1;
diff --git a/toonz/sources/tnztools/toonzvectorbrushtool.cpp b/toonz/sources/tnztools/toonzvectorbrushtool.cpp
index 751781dd..ccd5d276 100644
--- a/toonz/sources/tnztools/toonzvectorbrushtool.cpp
+++ b/toonz/sources/tnztools/toonzvectorbrushtool.cpp
@@ -1148,7 +1148,8 @@ void ToonzVectorBrushTool::leftButtonUp(const TPointD &pos,
     stroke->insertControlPoints(0.5);
 
   bool isEditingLevel = m_application->getCurrentFrame()->isEditingLevel();
-  if (!isEditingLevel) TUndoManager::manager()->beginBlock();
+  bool renameColumn   = m_isFrameCreated;
+  if (!isEditingLevel && renameColumn) TUndoManager::manager()->beginBlock();
 
   if (m_frameRange.getIndex()) {
     if (m_firstFrameId == -1) {
@@ -1257,7 +1258,7 @@ void ToonzVectorBrushTool::leftButtonUp(const TPointD &pos,
   }
 
   // Column name renamed to level name only if was originally empty
-  if (!isEditingLevel) {
+  if (!isEditingLevel && renameColumn) {
     int col = getApplication()->getCurrentColumn()->getColumnIndex();
     TXshColumn *column =
         getApplication()->getCurrentXsheet()->getXsheet()->getColumn(col);
diff --git a/toonz/sources/tnztools/typetool.cpp b/toonz/sources/tnztools/typetool.cpp
index be484c11..56e0fa3b 100644
--- a/toonz/sources/tnztools/typetool.cpp
+++ b/toonz/sources/tnztools/typetool.cpp
@@ -733,13 +733,14 @@ void TypeTool::stopEditing() {
   invalidate();
   if (m_undo) {
     bool isEditingLevel = getApplication()->getCurrentFrame()->isEditingLevel();
-    if (!isEditingLevel) TUndoManager::manager()->beginBlock();
+    bool renameColumn   = m_isFrameCreated;
+    if (!isEditingLevel && renameColumn) TUndoManager::manager()->beginBlock();
 
     TUndoManager::manager()->add(m_undo);
     m_undo = 0;
 
     // Column name renamed to level name only if was originally empty
-    if (!isEditingLevel) {
+    if (!isEditingLevel && renameColumn) {
       int col = getApplication()->getCurrentColumn()->getColumnIndex();
       TXshColumn *column =
           getApplication()->getCurrentXsheet()->getXsheet()->getColumn(col);