diff options
Diffstat (limited to 'patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch')
| -rw-r--r-- | patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch | 8 |
1 files changed, 4 insertions, 4 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 0fbeb86..0cd1c7c 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 @@ | |||
| 1 | From a41c5e9ce141713b12ad552205c27db41193c477 Mon Sep 17 00:00:00 2001 | 1 | From 54e7fb9c835b3ec8afcb5db55b03a8ead3ff6088 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ricardo Wurmus <rekado@elephly.net> | 2 | From: Ricardo Wurmus <rekado@elephly.net> |
| 3 | Date: Sat, 19 Dec 2020 00:57:26 +0100 | 3 | Date: Sat, 19 Dec 2020 00:57:26 +0100 |
| 4 | Subject: [PATCH 4/7] handleConnection: Switch R version when switching | 4 | Subject: [PATCH 4/7] handleConnection: Switch R version when switching |
| @@ -70,10 +70,10 @@ index 2fd08c028b..3e66f13dd7 100644 | |||
| 70 | module_context::sharedProjectScratchPath(), | 70 | module_context::sharedProjectScratchPath(), |
| 71 | version, | 71 | version, |
| 72 | diff --git a/src/gwt/src/org/rstudio/studio/client/projects/Projects.java b/src/gwt/src/org/rstudio/studio/client/projects/Projects.java | 72 | diff --git a/src/gwt/src/org/rstudio/studio/client/projects/Projects.java b/src/gwt/src/org/rstudio/studio/client/projects/Projects.java |
| 73 | index 89c3eb04b9..4ebeb6881d 100644 | 73 | index 71ce880487..63937c4806 100644 |
| 74 | --- a/src/gwt/src/org/rstudio/studio/client/projects/Projects.java | 74 | --- a/src/gwt/src/org/rstudio/studio/client/projects/Projects.java |
| 75 | +++ b/src/gwt/src/org/rstudio/studio/client/projects/Projects.java | 75 | +++ b/src/gwt/src/org/rstudio/studio/client/projects/Projects.java |
| 76 | @@ -1131,7 +1131,8 @@ public class Projects implements OpenProjectFileHandler, | 76 | @@ -1127,7 +1127,8 @@ public class Projects implements OpenProjectFileEvent.Handler, |
| 77 | { | 77 | { |
| 78 | // perform quit | 78 | // perform quit |
| 79 | applicationQuit_.performQuit(null, saveChanges, | 79 | applicationQuit_.performQuit(null, saveChanges, |
| @@ -84,5 +84,5 @@ index 89c3eb04b9..4ebeb6881d 100644 | |||
| 84 | }; | 84 | }; |
| 85 | 85 | ||
| 86 | -- | 86 | -- |
| 87 | 2.31.1 | 87 | 2.33.0 |
| 88 | 88 | ||
