summaryrefslogtreecommitdiff
path: root/src/yuzu_cmd/yuzu.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2018-10-06 02:43:09 -0400
committerGravatar GitHub2018-10-06 02:43:09 -0400
commitb8b90ce6e61329ebda226b9917ed961be3b80d1f (patch)
tree8e6b82419db7fb24eb5d8f06346a0a1228f9513c /src/yuzu_cmd/yuzu.cpp
parentMerge pull request #1447 from lioncash/mutex (diff)
parentReview comments - part 5 (diff)
downloadyuzu-b8b90ce6e61329ebda226b9917ed961be3b80d1f.tar.gz
yuzu-b8b90ce6e61329ebda226b9917ed961be3b80d1f.tar.xz
yuzu-b8b90ce6e61329ebda226b9917ed961be3b80d1f.zip
Merge pull request #1332 from FearlessTobi/port-web-backend
Port web_service from Citra
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
-rw-r--r--src/yuzu_cmd/yuzu.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index b2559b717..1d951ca3f 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -10,6 +10,7 @@
10#include <fmt/ostream.h> 10#include <fmt/ostream.h>
11 11
12#include "common/common_paths.h" 12#include "common/common_paths.h"
13#include "common/detached_tasks.h"
13#include "common/file_util.h" 14#include "common/file_util.h"
14#include "common/logging/backend.h" 15#include "common/logging/backend.h"
15#include "common/logging/filter.h" 16#include "common/logging/filter.h"
@@ -78,6 +79,7 @@ static void InitializeLogging() {
78 79
79/// Application entry point 80/// Application entry point
80int main(int argc, char** argv) { 81int main(int argc, char** argv) {
82 Common::DetachedTasks detached_tasks;
81 Config config; 83 Config config;
82 84
83 int option_index = 0; 85 int option_index = 0;
@@ -213,5 +215,6 @@ int main(int argc, char** argv) {
213 system.RunLoop(); 215 system.RunLoop();
214 } 216 }
215 217
218 detached_tasks.WaitForAllTasks();
216 return 0; 219 return 0;
217} 220}