hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-24 06:34:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into plugin-autostart

Browse source
This commit is contained in:
Lucien Greathouse 2019-05-04 21:43:10 -07:00
commit 6b709e7619
14 changed files with 181 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server/src/imfs.rs
View file

@ -89,11 +89,13 @@ impl Imfs {
pub fn add_root(&mut self, path: &Path) -> Result<(), FsError> {
debug_assert!(path.is_absolute());
debug_assert!(!self.is_within_roots(path));
self.roots.insert(path.to_path_buf());
if !self.is_within_roots(path) {
self.roots.insert(path.to_path_buf());
self.descend_and_read_from_disk(path)?;
}
self.descend_and_read_from_disk(path)
Ok(())
}
pub fn remove_root(&mut self, path: &Path) {