Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
VideoLAN
medialibrary
Commits
30dccc88
Commit
30dccc88
authored
Jul 02, 2018
by
Hugo Beauzée-Luyssen
Browse files
FsDiscover: Rename a variable for consistency
parent
68dfac29
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/discoverer/FsDiscoverer.cpp
View file @
30dccc88
...
...
@@ -113,12 +113,12 @@ void FsDiscoverer::reloadFolder( std::shared_ptr<Folder> f )
assert
(
f
->
isPresent
()
);
auto
mrl
=
f
->
mrl
();
std
::
shared_ptr
<
fs
::
IDirectory
>
folder
;
std
::
shared_ptr
<
fs
::
IDirectory
>
directory
;
try
{
folder
=
m_fsFactory
->
createDirectory
(
mrl
);
assert
(
folder
->
device
()
!=
nullptr
);
if
(
folder
->
device
()
==
nullptr
)
directory
=
m_fsFactory
->
createDirectory
(
mrl
);
assert
(
directory
->
device
()
!=
nullptr
);
if
(
directory
->
device
()
==
nullptr
)
return
;
}
catch
(
const
std
::
system_error
&
ex
)
...
...
@@ -129,7 +129,7 @@ void FsDiscoverer::reloadFolder( std::shared_ptr<Folder> f )
}
try
{
checkFolder
(
std
::
move
(
folder
),
std
::
move
(
f
),
false
);
checkFolder
(
std
::
move
(
directory
),
std
::
move
(
f
),
false
);
}
catch
(
DeviceRemovedException
&
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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