ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix 0e8e46f0 for gcc. 

gcc (mingw) does not allow converting a const char*[] to a char**
without -fpermissive. Make some adjustments to the string handling to
execute the cmd.exe command to delete the temp file.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2020-02-24 19:46:50 +00:00
parent 0e8e46f0b7
commit ba14cadba1
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/wx/winsparkle-wrapper.cpp
View File

@ -1,3 +1,4 @@
#include <cstdio>
#include <string> #include <string>
#include <stdexcept> #include <stdexcept>
@ -50,12 +51,16 @@ WinSparkleDllWrapper::~WinSparkleDllWrapper()
delete winsparkle_dll; delete winsparkle_dll;
// Wait for the program to exit and release the DLL before deleting the temp file, otherwise access is denied. // Wait for the program to exit and release the DLL before deleting the temp file, otherwise access is denied.
const auto shell_cmd = std::string("ping -n 3 127.0.0.1 > nul&set _file=") + temp_file_name + "&call del %^_file%"; char executable[] = "cmd.exe";
char cmd_switch[] = "/c";
const char* cmd[]{ char shell_cmd[500];
"cmd.exe", snprintf(shell_cmd, 500, "ping -n 3 127.0.0.1 > nul&set _file=%s&call del %%^_file%%", temp_file_name.mb_str().data());
"/c",
shell_cmd.c_str(), char* cmd[]{
executable,
cmd_switch,
shell_cmd,
NULL NULL
}; };