aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-x.travis/linux/docker.sh2
-rw-r--r--src/core/hle/service/hid/hid.h4
-rw-r--r--src/core/hle/service/nfp/nfp.cpp1
-rw-r--r--src/yuzu/main.cpp2
4 files changed, 4 insertions, 5 deletions
diff --git a/.travis/linux/docker.sh b/.travis/linux/docker.sh
index ec2cd0874..8b7e65911 100755
--- a/.travis/linux/docker.sh
+++ b/.travis/linux/docker.sh
@@ -1,7 +1,7 @@
#!/bin/bash -ex
apt-get update
-apt-get install --no-install-recommends -y build-essential git libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev libqt5webengine5 wget cmake ninja-build ccache
+apt-get install --no-install-recommends -y build-essential git libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev qtwebengine5-dev wget cmake ninja-build ccache
cd /yuzu
diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h
index 615d4e6d8..eca27c056 100644
--- a/src/core/hle/service/hid/hid.h
+++ b/src/core/hle/service/hid/hid.h
@@ -3,6 +3,8 @@
// Refer to the license.txt file included.
#pragma once
+
+#include "controllers/controller_base.h"
#include "core/hle/service/service.h"
namespace CoreTiming {
@@ -19,8 +21,6 @@ class ServiceManager;
namespace Service::HID {
-class ControllerBase;
-
enum class HidController : std::size_t {
DebugPad,
Touchscreen,
diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp
index a7bed0040..9ca5461db 100644
--- a/src/core/hle/service/nfp/nfp.cpp
+++ b/src/core/hle/service/nfp/nfp.cpp
@@ -11,7 +11,6 @@
#include "core/hle/kernel/readable_event.h"
#include "core/hle/kernel/writable_event.h"
#include "core/hle/lock.h"
-#include "core/hle/service/hid/hid.h"
#include "core/hle/service/nfp/nfp.h"
#include "core/hle/service/nfp/nfp_user.h"
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 18dc93c95..4eb73792f 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -351,7 +351,7 @@ void GMainWindow::WebBrowserOpenPage(std::string_view filename, std::string_view
running_exit_check = true;
}
- const auto input = npad.GetPressState();
+ const auto input = npad.GetAndResetPressState();
for (std::size_t i = 0; i < Settings::NativeButton::NumButtons; ++i) {
if ((input & (1 << i)) != 0) {
LOG_DEBUG(Frontend, "firing input for button id={:02X}", i);