razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

fix crash on converting single image

Browse source
This commit is contained in:
shun-iwasawa 2020-06-02 16:21:48 +09:00
parent 737bda7bba
commit 81092567bb
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
toonz/sources/toonz/convertpopup.cpp
View file

@ -826,10 +826,10 @@ void ConvertPopup::setFiles(const std::vector<TFilePath> &fps) {
if (m_srcFilePaths.size() == 1) { if (m_srcFilePaths.size() == 1) {
setWindowTitle(tr("Convert 1 Level")); setWindowTitle(tr("Convert 1 Level"));
m_fromFld->setEnabled(true);
m_toFld->setEnabled(true);
m_fileNameFld->setEnabled(true); m_fileNameFld->setEnabled(true);
m_fromFld->setEnabled(false);
m_toFld->setEnabled(false);
m_fromFld->setText(""); m_fromFld->setText("");
m_toFld->setText(""); m_toFld->setText("");
TLevelP levelTmp; TLevelP levelTmp;
@ -840,11 +840,13 @@ void ConvertPopup::setFiles(const std::vector<TFilePath> &fps) {
if (!t->empty()) { if (!t->empty()) {
TFrameId start = t->begin()->first; TFrameId start = t->begin()->first;
TFrameId end = t->rbegin()->first; TFrameId end = t->rbegin()->first;
if (start.getNumber() > 0) if (start.getNumber() >= 0 && end.getNumber() >= 0) {
m_fromFld->setEnabled(true);
m_toFld->setEnabled(true);
m_fromFld->setText(QString::number(start.getNumber())); m_fromFld->setText(QString::number(start.getNumber()));
if (end.getNumber() > 0)
m_toFld->setText(QString::number(end.getNumber())); m_toFld->setText(QString::number(end.getNumber()));
} }
}
// use the image dpi for the converted tlv // use the image dpi for the converted tlv
const TImageInfo *ii = lrTmp->getImageInfo(); const TImageInfo *ii = lrTmp->getImageInfo();
@ -895,7 +897,8 @@ Convert2Tlv *ConvertPopup::makeTlvConverter(const TFilePath &sourceFilePath) {
sourceFilePath.withParentDir(unpaintedFolder).withName(basename)); sourceFilePath.withParentDir(unpaintedFolder).withName(basename));
} }
int from = -1, to = -1; int from = -1, to = -1;
if (m_srcFilePaths.size() == 1) { if (m_srcFilePaths.size() == 1 && m_fromFld->isEnabled() &&
m_toFld->isEnabled()) {
from = m_fromFld->getValue(); from = m_fromFld->getValue();
to = m_toFld->getValue(); to = m_toFld->getValue();
} }