Skip to content

Commit 46ee0c9

Browse files
Only create executable path when executable is used
1 parent ce97a6d commit 46ee0c9

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

runtime/src/CoreClr.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,6 @@ void CoreClr::CreateAppDomain(alt::IServer* server, alt::IResource* resource, co
240240

241241
auto nativeDllPaths = alt::String(appPath) + LIST_SEPARATOR + runtimeDirectory;
242242

243-
auto executablePath = alt::String(appPath) + PATH_SEPARATOR + resource->GetMain();
244-
245243
const char* propertyKeys[] = {
246244
"TRUSTED_PLATFORM_ASSEMBLIES",
247245
"APP_PATHS",
@@ -275,6 +273,8 @@ void CoreClr::CreateAppDomain(alt::IServer* server, alt::IResource* resource, co
275273
}
276274

277275
if (executable) {
276+
auto executablePath = alt::String(appPath) + PATH_SEPARATOR + resource->GetMain();
277+
278278
server->LogInfo(alt::String("coreclr-module: Prepare for executing assembly:") + executablePath);
279279
int exitCode = -1;
280280
const char* args[1];
@@ -288,7 +288,7 @@ void CoreClr::CreateAppDomain(alt::IServer* server, alt::IResource* resource, co
288288
1,
289289
args,
290290
executablePath.CStr(),
291-
(unsigned int*)&exitCode
291+
(unsigned int*) &exitCode
292292
);
293293

294294
if (result < 0) {
@@ -297,7 +297,7 @@ void CoreClr::CreateAppDomain(alt::IServer* server, alt::IResource* resource, co
297297
alt::String("coreclr-module: Unable to execute assembly in app path:") + executablePath);
298298
this->PrintError(server, result);
299299
} else {
300-
server->LogInfo("coreclr-module: Assembly executed");
300+
server->LogInfo(alt::String("coreclr-module: Assembly executed"));
301301
char* x_str = new char[10];
302302
sprintf(x_str, "exit code: %d", exitCode);
303303
server->LogInfo(
@@ -339,7 +339,7 @@ void CoreClr::GetPath(alt::IServer* server, const char* defaultPath) {
339339
greatest = entry->d_name;
340340
continue;
341341
}
342-
if(semver_parse(entry->d_name, &compare_version)) {
342+
if (semver_parse(entry->d_name, &compare_version)) {
343343
server->LogInfo(alt::String("coreclr-module: invalid version found: ") + entry->d_name);
344344
continue;
345345
}

0 commit comments

Comments
 (0)