From f9ae86b6c9d8a19fc78711f033f1e48cb4d7ff03 Mon Sep 17 00:00:00 2001
From: Dirk Eddelbuettel <edd@debian.org>
Date: Sun, 2 Aug 2015 08:48:11 -0500
Subject: [PATCH] very simple fix for #309

if no rebuild is needed, still set an on.exit() handler to get back to the
starting directory
---
 ChangeLog      | 5 +++++
 R/Attributes.R | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 3ea0c1e03..38e719ee1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-02  Dirk Eddelbuettel  <edd@debian.org>
+
+        * R/Attributes.R (sourceCpp): In no-rebuild-needed case, also set a
+        default directory restoration via on.exit()
+
 2015-07-24  Dirk Eddelbuettel  <edd@debian.org>
 
         * DESCRIPTION: Release 0.12.0
diff --git a/R/Attributes.R b/R/Attributes.R
index 38c8e7249..17be9f6ac 100644
--- a/R/Attributes.R
+++ b/R/Attributes.R
@@ -153,6 +153,10 @@ sourceCpp <- function(file = "",
         }
     }
     else {
+        cwd <- getwd()
+        on.exit({
+            setwd(cwd)
+        })
         if (verbose)
             cat("\nNo rebuild required (use rebuild = TRUE to ",
                 "force a rebuild)\n\n", sep="")