FsDiscoverer: Handle an entrypoint not being found upon reload

src/discoverer/FsDiscoverer.cpp

@@ -125,7 +125,17 @@ void FsDiscoverer::reloadFolder( std::shared_ptr<Folder> f )
     {
         LOG_INFO( "Failed to instanciate a directory for ", mrl, ": ", ex.what(),
                   ". Can't reload the folder." );
-        return;
+    }
+    if ( directory == nullptr )
+    {
+        auto device = m_fsFactory->createDeviceFromMrl( mrl );
+        if ( device == nullptr || device->isRemovable() == false )
+        {
+            LOG_INFO( "Failed to find folder matching entrypoint ", mrl, ". "
+                      "Removing that folder" );
+            m_ml->deleteFolder( *f );
+            return;
+        }
     }
     try
     {

test/unittest/FolderTests.cpp

@@ -462,3 +462,15 @@ TEST_F( Folders, RemoveNonExistantEntryPoint )
     auto res = cbMock->waitEntryPointRemoved();
     ASSERT_TRUE( res );
 }
+
+TEST_F( Folders, RemoveRootFolder )
+{
+    ASSERT_EQ( 3u, ml->files().size() );
+    // Do not watch for live changes
+    ml.reset();
+    fsMock->removeFolder( mock::FileSystemFactory::Root );
+
+    Reload();
+
+    ASSERT_EQ( 0u, ml->files().size() );
+}