svn_sync

script/ide/FileSystemWatcher.lua

@@ -94,8 +94,12 @@ end
 
 -- remove this file watcher. 
 function FileSystemWatcher:Destroy()
+	self:RemoveAllDirectories();
 	unregisterCallback(self.name, self);
-	watcher_dirs[self.name] = nil;
+
+	if( not call_backs[self.name]) then
+		watcher_dirs[self.name] = nil;
+	end
 end
 
 
@@ -237,6 +241,18 @@ function FileSystemWatcher:RemoveDirectory(dir)
 	end
 end
 
+-- unwatch all directories
+function FileSystemWatcher:RemoveAllDirectories()
+	while(true) do
+		local dir = next(self.dirs, nil);
+		if(dir) then
+			self:RemoveDirectory(dir);
+		else
+			break;
+		end
+	end
+end
+
 -- because it is so common to watch for asset file changes, we added the following function
 -- call this at any time to start watching for files
 function FileSystemWatcher.EnableAssetFileWatcher()