Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Better async updating and new updater url

Browse Source
This commit is contained in:
momo5502 2016-08-31 01:10:26 +02:00
parent 73bacbaa96
commit 2d32d44da2
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Components/Modules/Console.cpp
View File

@ -406,11 +406,11 @@ namespace Components
// We can not force the termination in this thread // We can not force the termination in this thread
// The destructor would be called in this thread // The destructor would be called in this thread
// and would try to join this thread, which is impossible // and would try to join this thread, which is impossible
std::async([] () std::thread([] ()
{ {
std::this_thread::sleep_for(200ms); std::this_thread::sleep_for(200ms);
ExitProcess(static_cast<uint32_t>(-1)); ExitProcess(static_cast<uint32_t>(-1));
}); }).detach();
} }
else else
{ {

19
src/Components/Modules/News.cpp
View File

@ -51,9 +51,8 @@ namespace Components
ZeroMemory(&pInfo, sizeof(pInfo)); ZeroMemory(&pInfo, sizeof(pInfo));
sInfo.cb = sizeof(sInfo); sInfo.cb = sizeof(sInfo);
CreateProcessA("updater.dat", NULL, NULL, NULL, false, CREATE_NO_WINDOW, NULL, NULL, &sInfo, &pInfo); CreateProcessA("updater.exe", NULL, NULL, NULL, false, CREATE_NO_WINDOW, NULL, NULL, &sInfo, &pInfo);
Console::SetSkipShutdown();
TerminateProcess(GetCurrentProcess(), exitCode); TerminateProcess(GetCurrentProcess(), exitCode);
} }
@ -94,9 +93,10 @@ namespace Components
Localization::Set("MPUI_CHANGELOG_TEXT", "Loading..."); Localization::Set("MPUI_CHANGELOG_TEXT", "Loading...");
Localization::Set("MPUI_MOTD_TEXT", NEWS_MOTD_DEFUALT); Localization::Set("MPUI_MOTD_TEXT", NEWS_MOTD_DEFUALT);
if (Utils::IO::FileExists("updater.dat")) // TODO: Probably remove that, if the updater is part of the repo?
if (Utils::IO::FileExists("updater.exe"))
{ {
remove("updater.dat"); remove("updater.exe");
} }
Command::Add("checkforupdate", [] (Command::Params) Command::Add("checkforupdate", [] (Command::Params)
@ -112,11 +112,11 @@ namespace Components
Command::Execute("openmenu popup_reconnectingtoparty", true); Command::Execute("openmenu popup_reconnectingtoparty", true);
// Run the updater on shutdown // Run the updater on shutdown
Utils::Hook::Set(0x6D72A0, ExitProcessStub); Utils::Hook::Set(0x6D72A0, News::ExitProcessStub);
std::async([] () std::thread([] ()
{ {
std::string data = Utils::WebIO("IW4x", "http://localhost/iw4/updater/updater.exe").SetTimeout(5000)->Get(); std::string data = Utils::WebIO("IW4x", "https://iw4xcachep26muba.onion.to/iw4/updater.exe").SetTimeout(5000)->Get();
if (data.empty()) if (data.empty())
{ {
@ -126,10 +126,11 @@ namespace Components
} }
else else
{ {
Utils::IO::WriteFile("updater.dat", data); Console::SetSkipShutdown();
Utils::IO::WriteFile("updater.exe", data);
Command::Execute("wait 300; quit;", false); Command::Execute("wait 300; quit;", false);
} }
}); }).detach();
}); });
News::Terminate = false; News::Terminate = false;