goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

query the manager if a directory is watched instead of settings

pull/53/head
Zlatin Balevsky 2020-03-26 12:23:15 +00:00
parent dfc62b943f
commit faad6b6b0e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
View File

@ -413,7 +413,7 @@ class MainFrameModel {
break break
if (parent.getChildCount() == 0) { if (parent.getChildCount() == 0) {
File file = parent.getUserObject().file File file = parent.getUserObject().file
if (core.muOptions.watchedDirectories.contains(file.toString())) if (core.watchedDirectoryManager.isWatched(file))
unshared.add(file) unshared.add(file)
dmtn = parent dmtn = parent
continue continue

4
webui/src/main/java/com/muwire/webui/FileManager.java
View File

@ -134,14 +134,14 @@ public class FileManager {
} }
for (File directory : cb.directories) { for (File directory : cb.directories) {
if (core.getMuOptions().getWatchedDirectories().contains(directory.getAbsolutePath())) { if (core.getWatchedDirectoryManager().isWatched(directory)) {
DirectoryUnsharedEvent e = new DirectoryUnsharedEvent(); DirectoryUnsharedEvent e = new DirectoryUnsharedEvent();
e.setDirectory(directory); e.setDirectory(directory);
core.getEventBus().publish(e); core.getEventBus().publish(e);
} }
} }
if (core.getMuOptions().getWatchedDirectories().contains(file.getAbsolutePath())) { if (core.getWatchedDirectoryManager().isWatched(file)) {
DirectoryUnsharedEvent event = new DirectoryUnsharedEvent(); DirectoryUnsharedEvent event = new DirectoryUnsharedEvent();
event.setDirectory(file); event.setDirectory(file);
core.getEventBus().publish(event); core.getEventBus().publish(event);