From 893c10c6ca8b7a9c04b9aaa086a46503166c880b Mon Sep 17 00:00:00 2001
From: tassaron
Date: Sat, 30 Apr 2022 00:16:38 -0400
Subject: test if ffmpeg is really found at startup

---
 src/gui/mainwindow.py | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/mainwindow.py b/src/gui/mainwindow.py
index 1b28b7e..fcf4b4c 100644
--- a/src/gui/mainwindow.py
+++ b/src/gui/mainwindow.py
@@ -336,24 +336,32 @@ class MainWindow(QtWidgets.QMainWindow):
         log.info("Pillow version %s", Image.__version__)
 
         # verify Ffmpeg version
-        if not self.settings.value("ffmpegMsgShown"):
-            try:
-                with open(os.devnull, "w") as f:
-                    ffmpegVers = checkOutput(
-                        ['ffmpeg', '-version'], stderr=f
-                    )
-                goodVersion = str(ffmpegVers).split()[2].startswith('4')
-            except Exception:
-                goodVersion = False
-        else:
-            goodVersion = True
-
-        if not goodVersion:
+        if not self.core.FFMPEG_BIN:
             self.showMessage(
-                msg="You're using an old version of Ffmpeg. "
-                "Some features may not work as expected."
+                msg="FFmpeg could not be found. This is a critical error. "
+                "Install FFmpeg, or download it and place the program executable "
+                "in the same folder as this program.",
+                icon='Critical'
             )
-        self.settings.setValue("ffmpegMsgShown", True)
+        else:
+            if not self.settings.value("ffmpegMsgShown"):
+                try:
+                    with open(os.devnull, "w") as f:
+                        ffmpegVers = checkOutput(
+                            [self.core.FFMPEG_BIN, '-version'], stderr=f
+                        )
+                    goodVersion = str(ffmpegVers).split()[2].startswith('4')
+                except Exception:
+                    goodVersion = False
+            else:
+                goodVersion = True
+
+            if not goodVersion:
+                self.showMessage(
+                    msg="You're using an old version of Ffmpeg. "
+                    "Some features may not work as expected."
+                )
+            self.settings.setValue("ffmpegMsgShown", True)
 
         # Hotkeys for projects
         QtWidgets.QShortcut("Ctrl+S", self, self.saveCurrentProject)
-- 
cgit v1.2.3