Merge branch 'v0.21.x' into master

2020-09-04 18:35:21 +02:00
parent 9aa432c078 db8b419b8c
commit 67c7116f05
17 changed files with 185 additions and 110 deletions
--- a/src/neighbor/plugins/SmbclientNeighborPlugin.cxx
+++ b/src/neighbor/plugins/SmbclientNeighborPlugin.cxx
@@ -109,11 +109,6 @@ NeighborExplorer::List
 SmbclientNeighborExplorer::GetList() const noexcept
 {
 	const std::lock_guard<Mutex> protect(mutex);
-	/*
-	List list;
-	for (const auto &i : servers)
-		list.emplace_front(i.Export());
-	*/
 	return list;
 }