Merge pull request #183 from auneri/master

arokem · arokem · commit b1ca724b0620 · 2015-05-07T10:07:48.000-07:00
Respect current directory when starting MATLAB on Windows
diff --git a/pymatbridge/pymatbridge.py b/pymatbridge/pymatbridge.py
@@ -176,10 +176,11 @@ def _preamble_code(self):
         # suppress warnings while loading the path, in the case of
         # overshadowing a built-in function on a newer version of
         # Matlab (e.g. isrow)
-        return ["old_warning_state = warning('off','all')",
-                "addpath(genpath('%s'))" % MATLAB_FOLDER,
-                "warning(old_warning_state)",
-                "clear old_warning_state"]
+        return ["old_warning_state = warning('off','all');",
+                "addpath(genpath('%s'));" % MATLAB_FOLDER,
+                "warning(old_warning_state);",
+                "clear('old_warning_state');",
+                "cd('%s');" % os.getcwd()]
 
     def _execute_flag(self):  # pragma: no cover
         raise NotImplemented
