summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2022-09-20 13:19:11 +0200
committerJoas Schilling <coding@schilljs.com>2022-09-20 13:22:24 +0200
commitefedb218e3c95815fef33db1dbf96aab0a0cccc1 (patch)
tree35461ce857b3c383434951aab91522e82684a2ea
parentd0668ce3b746ce150c9552878a49fbe856634e14 (diff)
downloadnextcloud-server-efedb218e3c95815fef33db1dbf96aab0a0cccc1.tar.gz
nextcloud-server-efedb218e3c95815fef33db1dbf96aab0a0cccc1.zip
Fix FFMPEG preview manager
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--lib/private/PreviewManager.php6
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');
}