Skip to content
Permalink
Browse files

Merge pull request #5206 from rstudio/bugfix/default-working-dir

Resolve aliased working directories in prefs
  • Loading branch information...
jmcphers committed Aug 9, 2019
2 parents 3a4765d + 60afa88 commit 48dc9a60e0aff60ae7bdce555608da699d01ca6b
Showing with 3 additions and 2 deletions.
  1. +3 −2 src/cpp/session/SessionDirs.cpp
@@ -1,7 +1,7 @@
/*
* SessionDirs.cpp
*
* Copyright (C) 2009-17 by RStudio, Inc.
* Copyright (C) 2009-19 by RStudio, Inc.
*
* Unless you have received this program directly from RStudio pursuant
* to the terms of a commercial license agreement with RStudio, then
@@ -30,7 +30,8 @@ namespace dirs {
FilePath getDefaultWorkingDirectory()
{
// calculate using user settings
FilePath defaultWorkingDir = FilePath(prefs::userPrefs().initialWorkingDirectory());
FilePath defaultWorkingDir = module_context::resolveAliasedPath(
prefs::userPrefs().initialWorkingDirectory());
FilePath sessionDefaultWorkingDir = FilePath(session::options().defaultWorkingDir());

// return it if it exists, otherwise use the

0 comments on commit 48dc9a6

Please sign in to comment.
You can’t perform that action at this time.