Commit bfe122a9 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen
Browse files

MediaLibrary: Let the discoverer stop the fs factories

refs #362
parent c78030f3
......@@ -2743,11 +2743,6 @@ bool MediaLibrary::setExternalLibvlcInstance( libvlc_instance_t* inst )
m_discovererWorker.reset();
restartDiscoverer = true;
}
/*
* This assumes that all network device lister are using libvlc and therefor
* they will need to be recreated
*/
m_fsHolder.stopNetworkFsFactories();
/*
* The VLCMetadataService will fetch the new instance during its next run
......
......@@ -81,6 +81,9 @@ void DiscovererWorker::stop()
m_discoverer->interrupt();
/* Wake the thread in case it was waiting for more things to do */
m_cond.notify_all();
m_fsHolder->stopNetworkFsFactories();
/* And wait for all short requests to be handled */
m_thread.join();
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment