From efedb218e3c95815fef33db1dbf96aab0a0cccc1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 20 Sep 2022 13:19:11 +0200 Subject: Fix FFMPEG preview manager Signed-off-by: Joas Schilling --- lib/private/PreviewManager.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/private/PreviewManager.php b/lib/private/PreviewManager.php index e78bdefda8d..a2d34892c68 100644 --- a/lib/private/PreviewManager.php +++ b/lib/private/PreviewManager.php @@ -385,10 +385,10 @@ class PreviewManager implements IPreview { if (count($checkImagick->queryFormats('PDF')) === 1) { // Office requires openoffice or libreoffice $officeBinary = $this->config->getSystemValue('preview_libreoffice_path', null); - if (is_null($officeBinary)) { + if (!is_string($officeBinary)) { $officeBinary = $this->binaryFinder->findBinaryPath('libreoffice'); } - if (is_null($officeBinary)) { + if (!is_string($officeBinary)) { $officeBinary = $this->binaryFinder->findBinaryPath('openoffice'); } @@ -405,7 +405,7 @@ class PreviewManager implements IPreview { // Video requires avconv or ffmpeg if (in_array(Preview\Movie::class, $this->getEnabledDefaultProvider())) { $movieBinary = $this->binaryFinder->findBinaryPath('avconv'); - if (is_null($movieBinary)) { + if (!is_string($movieBinary)) { $movieBinary = $this->binaryFinder->findBinaryPath('ffmpeg'); } -- cgit v1.2.3