Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ public static boolean initLocalization(ConfigThingy config)
private static File findWollMuxConf(File wollMuxDir)
{
String relativeWollMuxConf = "/.lots/lots.conf";
String oldRelativeWollMuxConf = "/.wollmux/wollmux.conf";
ArrayList<String> searchPaths = new ArrayList<>();

String wollmuxConfPath = null;
Expand All @@ -257,6 +258,7 @@ private static File findWollMuxConf(File wollMuxDir)

searchPaths.add(new File(wollMuxDir, "lots.conf").getAbsolutePath());
searchPaths.add(System.getProperty("user.dir") + relativeWollMuxConf);
searchPaths.add(System.getProperty("user.dir") + oldRelativeWollMuxConf);
searchPaths.add(ETC_WOLLMUX_WOLLMUX_CONF);

// Check if windows
Expand Down