Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

Fix insert column crash without a column selected

manongjohncea09f6c7d1a
diff --git a/toonz/sources/toonz/columncommand.cpp b/toonz/sources/toonz/columncommand.cpp
index f392ef738..2944c16c2 100644
--- a/toonz/sources/toonz/columncommand.cpp
+++ b/toonz/sources/toonz/columncommand.cpp
@@ -813,6 +813,7 @@ void InsertEmptyColumnsUndo::undo() const {
void ColumnCmd::insertEmptyColumns(const std::set<int> &indices,
bool insertAfter) {
+ if (indices.empty()) return;
// Filter out all less than 0 indices (in particular, the 'camera' column
// in the Toonz derivative product "Tab")
std::vector<int> positiveIndices(indices.begin(), indices.end());
diff --git a/toonz/sources/toonz/columnselection.cpp b/toonz/sources/toonz/columnselection.cpp
index d1d208f02..9b1d59a0b 100644
--- a/toonz/sources/toonz/columnselection.cpp
+++ b/toonz/sources/toonz/columnselection.cpp
@@ -21,6 +21,7 @@
#include "orientation.h"
#include "toonz/preferences.h"
#include "toonz/txshchildlevel.h"
+#include "toonz/tcolumnhandle.h"
// TnzCore includes
#include "tvectorimage.h"
@@ -189,12 +190,22 @@ void TColumnSelection::cutColumns() {
//-----------------------------------------------------------------------------
void TColumnSelection::insertColumns() {
+ if (m_indices.empty()) {
+ int col = TApp::instance()->getCurrentColumn()->getColumnIndex();
+ if (col < 0) return;
+ selectColumn(col, true);
+ }
ColumnCmd::insertEmptyColumns(m_indices);
}
//-----------------------------------------------------------------------------
void TColumnSelection::insertColumnsAbove() {
+ if (m_indices.empty()) {
+ int col = TApp::instance()->getCurrentColumn()->getColumnIndex();
+ if (col < 0) return;
+ selectColumn(col, true);
+ }
ColumnCmd::insertEmptyColumns(m_indices, true);
}