Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
medialibrary
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
34
Issues
34
List
Boards
Labels
Milestones
Merge Requests
6
Merge Requests
6
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VideoLAN
medialibrary
Commits
8de4c09f
Commit
8de4c09f
authored
May 15, 2019
by
Hugo Beauzée-Luyssen
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Task: Fix potential issues with fs file restoration
refs
#92
parent
7661a1de
Pipeline
#6993
failed with stages
in 27 minutes and 41 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
src/parser/Task.cpp
src/parser/Task.cpp
+5
-2
No files found.
src/parser/Task.cpp
View file @
8de4c09f
...
...
@@ -409,8 +409,11 @@ bool Task::restoreLinkedEntities()
try
{
auto
files
=
parentFolderFs
->
files
();
auto
it
=
std
::
find_if
(
begin
(
files
),
end
(
files
),
[
&
mrl
](
std
::
shared_ptr
<
fs
::
IFile
>
f
)
{
return
f
->
mrl
()
==
mrl
;
// Don't compare entire mrls, this might yield false negative when a
// device has multiple mountpoints.
auto
fileName
=
utils
::
file
::
fileName
(
mrl
);
auto
it
=
std
::
find_if
(
begin
(
files
),
end
(
files
),
[
&
fileName
](
std
::
shared_ptr
<
fs
::
IFile
>
f
)
{
return
f
->
name
()
==
fileName
;
});
if
(
it
==
end
(
files
)
)
{
...
...
Hugo Beauzée-Luyssen
@chouquette
mentioned in commit
e1c18060
·
May 22, 2019
mentioned in commit
e1c18060
mentioned in commit e1c180609e92443a801521a3704049780b80f7c8
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment