Skip to content

Commit 4c59aba

Browse files
committed
Change new plugin installation locations on Linux
Move lastConfig.xml and windowState.xml to the new location
1 parent 260908a commit 4c59aba

3 files changed

Lines changed: 15 additions & 3 deletions

File tree

Source/MainWindow.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@
3030
static inline File getSavedStateDirectory() {
3131
#if defined(__APPLE__)
3232
File dir = File::getSpecialLocation(File::userApplicationDataDirectory).getChildFile("Application Support/open-ephys");
33-
#else
33+
#elif _WIN32
3434
File dir = File::getSpecialLocation(File::commonApplicationDataDirectory).getChildFile("Open Ephys");
35+
#else
36+
File dir = File::getSpecialLocation(File::userApplicationDataDirectory).getChildFile(".open-ephys");;
3537
#endif
3638
if (!dir.isDirectory()) {
3739
dir.createDirectory();

Source/Processors/PluginManager/PluginManager.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@ PluginManager::PluginManager()
8585

8686
AddDllDirectory(installSharedPath.getFullPathName().toWideCharPointer());
8787
SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
88+
#elif __linux__
89+
File installSharedPath = File::getSpecialLocation(File::userApplicationDataDirectory).getChildFile(".open-ephys/shared");
90+
if (!installSharedPath.isDirectory()) {
91+
installSharedPath.createDirectory();
92+
}
8893
#endif
8994
}
9095

@@ -100,9 +105,12 @@ void PluginManager::loadAllPlugins()
100105
#ifdef __APPLE__
101106
paths.add(File::getSpecialLocation(File::currentApplicationFile).getChildFile("Contents/PlugIns"));
102107
paths.add(File::getSpecialLocation(File::userApplicationDataDirectory).getChildFile("Application Support/open-ephys/plugins"));
108+
#elif _WIN32
109+
paths.add(File::getSpecialLocation(File::currentApplicationFile).getParentDirectory().getChildFile("plugins"));
110+
paths.add(File::getSpecialLocation(File::commonApplicationDataDirectory).getChildFile("Open Ephys/plugins"));
103111
#else
104112
paths.add(File::getSpecialLocation(File::currentApplicationFile).getParentDirectory().getChildFile("plugins"));
105-
paths.add(File::getSpecialLocation(File::commonApplicationDataDirectory).getChildFile("Open Ephys/plugins"));
113+
paths.add(File::getSpecialLocation(File::userApplicationDataDirectory).getChildFile(".open-ephys/plugins"));
106114
#endif
107115

108116
for (auto &pluginPath : paths) {

Source/UI/PluginInstaller.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@
4040
static inline File getPluginsLocationDirectory() {
4141
#if defined(__APPLE__)
4242
File dir = File::getSpecialLocation(File::userApplicationDataDirectory).getChildFile("Application Support/open-ephys");
43-
#else
43+
#elif _WIN32
4444
File dir = File::getSpecialLocation(File::commonApplicationDataDirectory).getChildFile("Open Ephys");
45+
#else
46+
File dir = File::getSpecialLocation(File::userApplicationDataDirectory).getChildFile(".open-ephys");;
4547
#endif
4648
return std::move(dir);
4749
}

0 commit comments

Comments
 (0)