summary refs log tree commit diff
path: root/src/timeline/TimelineModel.cpp
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2021-03-15 15:51:10 +0000
committerGitHub <noreply@github.com>2021-03-15 15:51:10 +0000
commit6548b84e2934dd76c59b87be10f729e2fc9b6f2a (patch)
treeea5b7ec67143269ae968bcf23b8eda1d765366b6 /src/timeline/TimelineModel.cpp
parentRotate session keys properly (diff)
parentprepend file:// for linux and macos (diff)
downloadnheko-6548b84e2934dd76c59b87be10f729e2fc9b6f2a.tar.xz
Merge pull request #523 from Jedi18/master
Fix windows video bug
Diffstat (limited to 'src/timeline/TimelineModel.cpp')
-rw-r--r--src/timeline/TimelineModel.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp

index ddec7287..6134262e 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp
@@ -1246,7 +1246,11 @@ TimelineModel::cacheMedia(QString eventId, std::function<void(const QString)> ca QDir().mkpath(filename.path()); if (filename.isReadable()) { +#if defined(Q_OS_WIN) emit mediaCached(mxcUrl, filename.filePath()); +#else + emit mediaCached(mxcUrl, "file://" + filename.filePath()); +#endif if (callback) { callback(filename.filePath()); } @@ -1288,7 +1292,11 @@ TimelineModel::cacheMedia(QString eventId, std::function<void(const QString)> ca nhlog::ui()->warn("Error while saving file to: {}", e.what()); } +#if defined(Q_OS_WIN) emit mediaCached(mxcUrl, filename.filePath()); +#else + emit mediaCached(mxcUrl, "file://" + filename.filePath()); +#endif }); }