Skip to content

Commit c4297fe

Browse files
committed
Update default save directory
1 parent f1b182c commit c4297fe

3 files changed

Lines changed: 7 additions & 9 deletions

File tree

Source/CoreServices.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,16 @@ namespace CoreServices
229229
File getDefaultUserSaveDirectory()
230230
{
231231
#if defined(__APPLE__)
232-
File dir = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("open-ephys");
232+
const File dir = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("Open Ephys");
233+
#elif _WIN32
234+
const File dir = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("Open Ephys");
235+
#else
236+
const File dir = File::getSpecialLocation(File::userHomeDirectory).getChildFile("open-ephys");
237+
#endif
233238
if (!dir.isDirectory()) {
234239
dir.createDirectory();
235240
}
236241
return std::move(dir);
237-
#else
238-
return File::getCurrentWorkingDirectory();
239-
#endif
240242
}
241243

242244
String getGUIVersion()

Source/UI/ControlPanel.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -426,11 +426,7 @@ ControlPanel::ControlPanel(ProcessorGraph* graph_, AudioComponent* audio_)
426426
addChildComponent(newDirectoryButton);
427427

428428

429-
#if defined(__APPLE__)
430429
const File dataDirectory = CoreServices::getDefaultUserSaveDirectory();
431-
#else
432-
const File dataDirectory = File::getSpecialLocation(File::currentExecutableFile).getParentDirectory();
433-
#endif
434430

435431
filenameComponent = new FilenameComponent("folder selector",
436432
dataDirectory.getFullPathName(),

Source/UI/PluginInstaller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static inline File getPluginsLocationDirectory() {
4343
#elif _WIN32
4444
File dir = File::getSpecialLocation(File::commonApplicationDataDirectory).getChildFile("Open Ephys");
4545
#else
46-
File dir = File::getSpecialLocation(File::userApplicationDataDirectory).getChildFile(".open-ephys");;
46+
File dir = File::getSpecialLocation(File::userApplicationDataDirectory).getChildFile(".open-ephys");
4747
#endif
4848
return std::move(dir);
4949
}

0 commit comments

Comments
 (0)