Merge pull request rstudio#5236 from rstudio/bugfix/prefs-layer-crash

Fix crash when reloading preferences
gvpathi · Aug 14, 2019 · f7bd49e · f7bd49e
2 parents 46c6915 + 04f38eb
commit f7bd49e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/cpp/session/prefs/UserPrefsLayer.cpp b/src/cpp/session/prefs/UserPrefsLayer.cpp
@@ -58,7 +58,8 @@ void UserPrefsLayer::onPrefsFileChanged()
  }
 
  // Make a copy of the prefs prior to reloading, so we can diff against the old copy
- const json::Object old = cache_->clone().get_obj();
+ const json::Value oldVal = cache_->clone();
+ const json::Object old = oldVal.get_obj();
 
  // Reload the prefs from the file
  Error error = loadPrefsFromFile(prefsFile_);