summaryrefslogtreecommitdiff
path: root/src/yuzu/bootmanager.h
diff options
context:
space:
mode:
authorJames Rowe <jroweboy@gmail.com>2020-03-24 22:57:36 -0600
committerJames Rowe <jroweboy@gmail.com>2020-03-25 23:32:42 -0600
commitcf9c94d4017120b618194a720942ef4e5c8289bd (patch)
tree30cbea0216626e3a1db1a68120b54e6bd53804f5 /src/yuzu/bootmanager.h
parent282adfc70b5d7d958d564bfda0227bb3fbd8d110 (diff)
Address review and fix broken yuzu-tester build
Diffstat (limited to 'src/yuzu/bootmanager.h')
-rw-r--r--src/yuzu/bootmanager.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h
index 3739ec7ed..d69078df1 100644
--- a/src/yuzu/bootmanager.h
+++ b/src/yuzu/bootmanager.h
@@ -7,11 +7,12 @@
#include <atomic>
#include <condition_variable>
#include <mutex>
-#include <thread>
+
#include <QImage>
#include <QThread>
#include <QWidget>
#include <QWindow>
+
#include "common/thread.h"
#include "core/core.h"
#include "core/frontend/emu_window.h"
@@ -84,8 +85,8 @@ private:
bool exec_step = false;
bool running = false;
std::atomic_bool stop_run{false};
- std::mutex running_mutex = {};
- std::condition_variable running_cv = {};
+ std::mutex running_mutex;
+ std::condition_variable running_cv;
signals:
/**
@@ -154,7 +155,7 @@ public:
void CaptureScreenshot(u32 res_scale, const QString& screenshot_path);
- std::pair<u32, u32> ScaleTouch(const QPointF pos) const;
+ std::pair<u32, u32> ScaleTouch(const QPointF& pos) const;
public slots:
void OnEmulationStarting(EmuThread* emu_thread);