Commit ba3168b2 authored by nanahira's avatar nanahira

Merge branch 'master' into server

parents 9cdce219 2598b193
...@@ -321,7 +321,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -321,7 +321,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
NetServer::StopServer(); NetServer::StopServer();
break; break;
} }
STARTUPINFO si; STARTUPINFOW si;
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
ZeroMemory(&si, sizeof(si)); ZeroMemory(&si, sizeof(si));
si.cb = sizeof(si); si.cb = sizeof(si);
......
Subproject commit f01ebeb6df7b0e690c99aa614e1fe8dec97002a2 Subproject commit 2df1af0d752a3e958a7ac77b23a57695c5b99f65
Subproject commit 92551d40a2848cf03c28bdf1590e4180d7a8579c Subproject commit bab4c6c7309838f4995e9d38cb33fa1852d70dca
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment