From 1ab7cf5db22f7ce78e45ec107cd5f4beae924fdb Mon Sep 17 00:00:00 2001 From: Shinya Kitaoka <skitaoka@gmail.com> Date: Apr 27 2016 05:55:02 +0000 Subject: Merge pull request #246 from shun-iwasawa/fix_function_editor_crash Fix crash when typing an expression without selecting curve in function editor --- diff --git a/toonz/sources/toonzqt/functionsegmentviewer.cpp b/toonz/sources/toonzqt/functionsegmentviewer.cpp index e3f9f6a..c6908ac 100644 --- a/toonz/sources/toonzqt/functionsegmentviewer.cpp +++ b/toonz/sources/toonzqt/functionsegmentviewer.cpp @@ -1173,6 +1173,7 @@ void FunctionSegmentViewer::refresh() TDoubleKeyframe kf = m_curve->getKeyframeAt(m_r0); int pageIndex = typeToIndex(kf.m_type); + m_typeCombo->setEnabled(true); m_typeCombo->setCurrentIndex(pageIndex); if (0 <= pageIndex && pageIndex < tArrayCount(m_pages)) { m_parametersPanel->setCurrentIndex(pageIndex); @@ -1217,11 +1218,13 @@ void FunctionSegmentViewer::refresh() QRect selectedCells = m_sheet->getSelectedCells(); /*--- 選択範囲が空のとき、もしくはカーブが選ばれていないとき ---*/ if (selectedCells.isEmpty() || !m_curve) { + m_typeCombo->setEnabled(false); m_fromFld->setText(""); m_toFld->setText(""); } /*--- 何かカーブが選択されている ---*/ else { + m_typeCombo->setEnabled(true); int s0 = selectedCells.top(); int s1 = selectedCells.bottom();