1 files changed, 7 insertions, 7 deletions

diff --git a/patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch b/patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch
index c3af0e0..3531ed6 100644
--- a/patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch
+++ b/patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch
@@ -1,4 +1,4 @@
-From b31dfc6f120c01ff6612b682b56d92449eb82ef8 Mon Sep 17 00:00:00 2001
+From 296b8aa60025f88f34167f35d257cc401352d231 Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Sat, 19 Dec 2020 00:57:26 +0100
 Subject: [PATCH 4/7] handleConnection: Switch R version when switching
@@ -13,7 +13,7 @@ project switch back to the default.
  2 files changed, 30 insertions(+), 5 deletions(-)
 
 diff --git a/src/cpp/session/SessionHttpMethods.cpp b/src/cpp/session/SessionHttpMethods.cpp
-index 2b313f2b77..19669a3623 100644
+index 01e3ffb12f..133ae4abad 100644
 --- a/src/cpp/session/SessionHttpMethods.cpp
 +++ b/src/cpp/session/SessionHttpMethods.cpp
 @@ -2,6 +2,7 @@
@@ -24,7 +24,7 @@ index 2b313f2b77..19669a3623 100644
   *
   * Unless you have received this program directly from Posit Software pursuant
   * to the terms of a commercial license agreement with Posit Software, then
-@@ -711,6 +712,33 @@ void handleConnection(boost::shared_ptr<HttpConnection> ptrConnection,
+@@ -734,6 +735,33 @@ void handleConnection(boost::shared_ptr<HttpConnection> ptrConnection,
                    activeSession().setWorkingDir(projDir);
                 }
  
@@ -58,7 +58,7 @@ index 2b313f2b77..19669a3623 100644
                 if (options().switchProjectsWithUrl())
                 {
                    r_util::SessionScope scope;
-@@ -763,10 +791,6 @@ void handleConnection(boost::shared_ptr<HttpConnection> ptrConnection,
+@@ -789,10 +817,6 @@ void handleConnection(boost::shared_ptr<HttpConnection> ptrConnection,
                       {
                          FilePath projFile = resolveAliasedPath(switchToProject);
                          std::string projDir = createAliasedPath(projFile.getParent());
@@ -70,10 +70,10 @@ index 2b313f2b77..19669a3623 100644
                                                             module_context::sharedProjectScratchPath(),
                                                             version,
 diff --git a/src/gwt/src/org/rstudio/studio/client/projects/Projects.java b/src/gwt/src/org/rstudio/studio/client/projects/Projects.java
-index 0ab01f9945..26c332b58d 100644
+index b369c97c24..066a0c9db0 100644
 --- a/src/gwt/src/org/rstudio/studio/client/projects/Projects.java
 +++ b/src/gwt/src/org/rstudio/studio/client/projects/Projects.java
-@@ -1131,7 +1131,8 @@ public class Projects implements OpenProjectFileEvent.Handler,
+@@ -1184,7 +1184,8 @@ public class Projects implements OpenProjectFileEvent.Handler,
                          {
                             // perform quit
                             applicationQuit_.performQuit(null, saveChanges,
@@ -84,5 +84,5 @@ index 0ab01f9945..26c332b58d 100644
                       };
  
 -- 
-2.52.0
+2.54.0