Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4211 from wwylele/web-cleanup

Browse source 
web_service: stop using std::future + callback style async
This commit is contained in:
Weiyi Wang 2018-09-29 23:02:27 -04:00 • committed by GitHub
commit 4a30a502a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 333 additions and 458 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/citra_qt/main.cpp
View file

@ -43,6 +43,7 @@
#include "citra_qt/updater/updater.h"
#include "citra_qt/util/clickable_label.h"
#include "common/common_paths.h"
#include "common/detached_tasks.h"
#include "common/logging/backend.h"
#include "common/logging/filter.h"
#include "common/logging/log.h"
@ -1666,6 +1667,7 @@ void GMainWindow::SetDiscordEnabled(bool state) {
#endif
int main(int argc, char* argv[]) {
Common::DetachedTasks detached_tasks;
MicroProfileOnThreadCreate("Frontend");
SCOPE_EXIT({ MicroProfileShutdown(); });
@ -1691,5 +1693,7 @@ int main(int argc, char* argv[]) {
Frontend::RegisterSoftwareKeyboard(std::make_shared<QtKeyboard>(main_window));
main_window.show();
return app.exec();
int result = app.exec();
detached_tasks.WaitForAllTasks();
return result;
}