Added a .revert() to the locally_change_current_dir object.

daben · Jul 2, 2015 · b52e50a · b52e50a
1 parent 4844481
commit b52e50a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/dlib/misc_api/misc_api_kernel_abstract.h b/dlib/misc_api/misc_api_kernel_abstract.h
@@ -90,7 +90,16 @@ namespace dlib
         );
         /*!
             ensures
-                - calls set_current_dir(old_dir())
+                - if (revert() hasn't already been called) then
+                    - calls set_current_dir(old_dir())
+        !*/
+
+        void revert (
+        );
+        /*!
+            ensures
+                - if (revert() hasn't already been called) then
+                    - calls set_current_dir(old_dir())
         !*/
     };
 

diff --git a/dlib/misc_api/misc_api_shared.h b/dlib/misc_api/misc_api_shared.h
@@ -18,13 +18,14 @@ namespace dlib
             const std::string& new_dir
         )
         {
+            reverted = false;
             _old_dir = get_current_dir();
             set_current_dir(new_dir);
         }
 
         ~locally_change_current_dir()
         {
-            set_current_dir(_old_dir);
+            revert();
         }
 
         const std::string& old_dir (
@@ -33,7 +34,18 @@ namespace dlib
             return _old_dir;
         }
 
+        void revert (
+        )
+        {
+            if (!reverted)
+            {
+                set_current_dir(_old_dir);
+                reverted = true;
+            }
+        }
+
     private:
+        bool reverted;
         std::string _old_dir;
     };