From d04dc64bd9afd855fed411cf5573450efbda2a75 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Sun, 7 Jun 2015 19:38:01 -0700 Subject: [PATCH] Fix Access Violation due to __wargv. --- Sources/Plasma/Apps/plClient/winmain.cpp | 2 +- Sources/Plasma/Apps/plUruLauncher/plClientLauncher.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Plasma/Apps/plClient/winmain.cpp b/Sources/Plasma/Apps/plClient/winmain.cpp index 0b37e3a9..458d5b6d 100644 --- a/Sources/Plasma/Apps/plClient/winmain.cpp +++ b/Sources/Plasma/Apps/plClient/winmain.cpp @@ -1136,7 +1136,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nC std::vector args; args.reserve(__argc); for (size_t i = 0; i < __argc; i++) { - args.push_back(plString::FromWchar(__wargv[i])); + args.push_back(plString::FromUtf8(__argv[i])); } plCmdParser cmdParser(s_cmdLineArgs, arrsize(s_cmdLineArgs)); diff --git a/Sources/Plasma/Apps/plUruLauncher/plClientLauncher.cpp b/Sources/Plasma/Apps/plUruLauncher/plClientLauncher.cpp index 40e678d0..f2ae1866 100644 --- a/Sources/Plasma/Apps/plUruLauncher/plClientLauncher.cpp +++ b/Sources/Plasma/Apps/plUruLauncher/plClientLauncher.cpp @@ -445,7 +445,7 @@ void plClientLauncher::ParseArguments() std::vector args; args.reserve(__argc); for (size_t i = 0; i < __argc; i++) { - args.push_back(plString::FromWchar(__wargv[i])); + args.push_back(plString::FromUtf8(__argv[i])); } plCmdParser cmdParser(cmdLineArgs, arrsize(cmdLineArgs));