From ee95c973e9b47a2a22f75d4aa48abe7c2a14d61a Mon Sep 17 00:00:00 2001 From: "David S. Beach" Date: Thu, 5 Nov 2015 09:06:48 -0500 Subject: [PATCH] Fixes #3024: Companion 2.1 (windows) - Lua 'execute' fails in non-root directory (ported from master, re #3025) --- radio/src/targets/simu/simpgmspace.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp index 704953283..bae81ce8e 100644 --- a/radio/src/targets/simu/simpgmspace.cpp +++ b/radio/src/targets/simu/simpgmspace.cpp @@ -720,7 +720,7 @@ FATFS g_FATFS_Obj; char * convertSimuPath(const char *path) { static char result[1024]; - if (path[0] == '/' && strcmp(simuSdDirectory, "/") != 0) + if (((path[0] == '/') || (path[0] == '\\')) && (strcmp(simuSdDirectory, "/") != 0)) sprintf(result, "%s%s", simuSdDirectory, path); else strcpy(result, path); @@ -1044,6 +1044,7 @@ FRESULT f_getcwd (TCHAR *path, UINT sz_path) // remove simuSdDirectory from the cwd strcpy(path, cwd + strlen(simuSdDirectory)); + TRACE("f_getcwd() = %s", path); return FR_OK; }