From 1a97781e8c335dbf0b344bb0adfd23e5bdedeff6 Mon Sep 17 00:00:00 2001
From: manongjohn <manongjohn@users.noreply.github.com>
Date: Mon, 15 Mar 2021 18:17:06 -0400
Subject: [PATCH] Disable timeouts with 0 values

---
 toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp | 5 ++++-
 toonz/sources/image/ffmpeg/tiio_ffmpeg.h   | 2 +-
 toonz/sources/toonz/lipsyncpopup.cpp       | 5 ++++-
 toonz/sources/toonz/preferencespopup.cpp   | 6 +++---
 toonz/sources/toonzlib/preferences.cpp     | 6 +++---
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp b/toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp
index 0713b53a..cfca9854 100644
--- a/toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp
+++ b/toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp
@@ -15,7 +15,10 @@
 Ffmpeg::Ffmpeg() {
   m_ffmpegPath    = Preferences::instance()->getFfmpegPath();
   m_ffmpegTimeout = Preferences::instance()->getFfmpegTimeout();
-  if (m_ffmpegTimeout > 0) m_ffmpegTimeout * 1000;
+  if (m_ffmpegTimeout > 0)
+    m_ffmpegTimeout * 1000;
+  else
+    m_ffmpegTimeout    = -1;
   std::string strPath  = m_ffmpegPath.toStdString();
   m_intermediateFormat = "png";
 }
diff --git a/toonz/sources/image/ffmpeg/tiio_ffmpeg.h b/toonz/sources/image/ffmpeg/tiio_ffmpeg.h
index 88747db0..67248aa5 100644
--- a/toonz/sources/image/ffmpeg/tiio_ffmpeg.h
+++ b/toonz/sources/image/ffmpeg/tiio_ffmpeg.h
@@ -46,7 +46,7 @@ public:
 private:
   QString m_intermediateFormat, m_ffmpegPath, m_audioPath, m_audioFormat;
   int m_frameCount    = 0, m_lx, m_ly, m_bpp, m_bitsPerSample, m_channelCount,
-      m_ffmpegTimeout = 30000, m_frameNumberOffset = -1;
+      m_ffmpegTimeout = -1, m_frameNumberOffset = -1;
   double m_frameRate  = 24.0;
   bool m_ffmpegExists = false, m_ffprobeExists = false, m_hasSoundTrack = false;
   TFilePath m_path;
diff --git a/toonz/sources/toonz/lipsyncpopup.cpp b/toonz/sources/toonz/lipsyncpopup.cpp
index a1503b79..70a82881 100644
--- a/toonz/sources/toonz/lipsyncpopup.cpp
+++ b/toonz/sources/toonz/lipsyncpopup.cpp
@@ -835,7 +835,10 @@ void LipSyncPopup::onApplyButton() {
     }
     runRhubarb();
     int rhubarbTimeout = Preferences::instance()->getRhubarbTimeout();
-    if (rhubarbTimeout > 0) rhubarbTimeout * 1000;
+    if (rhubarbTimeout > 0)
+      rhubarbTimeout * 1000;
+    else
+      rhubarbTimeout = -1;
     m_rhubarb->waitForFinished(rhubarbTimeout);
     m_progressDialog->hide();
     QString results = m_rhubarb->readAllStandardError();
diff --git a/toonz/sources/toonz/preferencespopup.cpp b/toonz/sources/toonz/preferencespopup.cpp
index b68a470e..d85c28df 100644
--- a/toonz/sources/toonz/preferencespopup.cpp
+++ b/toonz/sources/toonz/preferencespopup.cpp
@@ -1043,10 +1043,10 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) {
 
       // Import / Export
       {ffmpegPath, tr("Executable Directory:")},
-      {ffmpegTimeout, tr("Import/Export Timeout (sec; -1 = no timeout):")},
+      {ffmpegTimeout, tr("Import/Export Timeout (seconds):")},
       {fastRenderPath, tr("Fast Render Output Directory:")},
       {rhubarbPath, tr("Executable Directory:")},
-      {rhubarbTimeout, tr("Analyze Audio Timeout (sec; -1 = no timeout):") },
+      {rhubarbTimeout, tr("Analyze Audio Timeout (seconds):")},
 
       // Drawing
       {scanLevelType, tr("Scan File Format:")},
@@ -1635,7 +1635,7 @@ QWidget* PreferencesPopup::createImportExportPage() {
 
   QGridLayout* rhubarbOptionsLay = insertGroupBox(tr("Rhubarb Lip Sync"), lay);
   {
-    insertUI(rhubarbPath, rhubarbOptionsLay); 
+    insertUI(rhubarbPath, rhubarbOptionsLay);
     insertUI(rhubarbTimeout, rhubarbOptionsLay);
   }
 
diff --git a/toonz/sources/toonzlib/preferences.cpp b/toonz/sources/toonzlib/preferences.cpp
index fc3c98af..3223d07d 100644
--- a/toonz/sources/toonzlib/preferences.cpp
+++ b/toonz/sources/toonzlib/preferences.cpp
@@ -446,12 +446,12 @@ void Preferences::definePreferenceItems() {
 
   // Import / Export
   define(ffmpegPath, "ffmpegPath", QMetaType::QString, "");
-  define(ffmpegTimeout, "ffmpegTimeout", QMetaType::Int, -1, -1,
+  define(ffmpegTimeout, "ffmpegTimeout", QMetaType::Int, 0, 0,
          std::numeric_limits<int>::max());
   define(fastRenderPath, "fastRenderPath", QMetaType::QString, "desktop");
   define(rhubarbPath, "rhubarbPath", QMetaType::QString, "");
-  define(rhubarbTimeout, "rhubarbTimeout", QMetaType::Int, -1, -1,
-    std::numeric_limits<int>::max());
+  define(rhubarbTimeout, "rhubarbTimeout", QMetaType::Int, 0, 0,
+         std::numeric_limits<int>::max());
 
   // Drawing
   define(scanLevelType, "scanLevelType", QMetaType::QString, "tif");