From 07eb54605c4d2710c53f68b936003cbc1a1c99de Mon Sep 17 00:00:00 2001 From: manongjohn Date: Mon, 12 Apr 2021 00:04:39 -0400 Subject: [PATCH] Fix converting timeout from sec to msec --- toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp | 2 +- toonz/sources/toonz/lipsyncpopup.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp b/toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp index cfca9854..dc1d858c 100644 --- a/toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp +++ b/toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp @@ -16,7 +16,7 @@ Ffmpeg::Ffmpeg() { m_ffmpegPath = Preferences::instance()->getFfmpegPath(); m_ffmpegTimeout = Preferences::instance()->getFfmpegTimeout(); if (m_ffmpegTimeout > 0) - m_ffmpegTimeout * 1000; + m_ffmpegTimeout *= 1000; else m_ffmpegTimeout = -1; std::string strPath = m_ffmpegPath.toStdString(); diff --git a/toonz/sources/toonz/lipsyncpopup.cpp b/toonz/sources/toonz/lipsyncpopup.cpp index c6cb22af..ba6f6c2a 100644 --- a/toonz/sources/toonz/lipsyncpopup.cpp +++ b/toonz/sources/toonz/lipsyncpopup.cpp @@ -836,7 +836,7 @@ void LipSyncPopup::onApplyButton() { runRhubarb(); int rhubarbTimeout = Preferences::instance()->getRhubarbTimeout(); if (rhubarbTimeout > 0) - rhubarbTimeout * 1000; + rhubarbTimeout *= 1000; else rhubarbTimeout = -1; m_rhubarb->waitForFinished(rhubarbTimeout);