diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2022-09-20 15:00:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-20 15:00:12 +0200 |
| commit | 132012c075785f2d6dc5bd73845b69f547ebe5be (patch) | |
| tree | 8e94161bca9ca32ae70f1a7e9e4759c4670a01a3 /lib | |
| parent | 20ee356a29868e945c8e2c1537319ef0de12ee30 (diff) | |
| parent | efedb218e3c95815fef33db1dbf96aab0a0cccc1 (diff) | |
| download | nextcloud-server-132012c075785f2d6dc5bd73845b69f547ebe5be.tar.gz nextcloud-server-132012c075785f2d6dc5bd73845b69f547ebe5be.zip | |
Merge pull request #34161 from nextcloud/bugfix/noid/fix-ffmpeg-preview-manager
Fix FFMPEG preview manager
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/PreviewManager.php | 6 |
1 files changed, 3 insertions, 3 deletions
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'); } |