izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix weird bug where Sunshine couldn't accept user input from terminal on Linux

Browse Source
This commit is contained in:
loki
2021-07-25 13:16:17 +02:00
parent ab70a056fc
commit d9f7952710
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sunshine/platform/linux/input.cpp
+9 -4
View File
@@ -558,7 +558,7 @@ public:
std::filesystem::remove(key_path); std::filesystem::remove(key_path);
} }
touch_input.reset(); keyboard_input.reset();
} }
void clear_mouse() { void clear_mouse() {
@@ -574,14 +574,18 @@ public:
void clear_gamepad(int nr) { void clear_gamepad(int nr) {
auto &[dev, _] = gamepads[nr]; auto &[dev, _] = gamepads[nr];
if(!dev) {
return;
}
// Remove this gamepad from notifications // Remove this gamepad from notifications
rumble_ctx->rumble_queue_queue.raise(nr, dev.get(), nullptr, pollfd {}); rumble_ctx->rumble_queue_queue.raise(nr, dev.get(), nullptr, pollfd_t {});
std::stringstream ss; std::stringstream ss;
ss << "sunshine_gamepad_"sv << nr; ss << "sunshine_gamepad_"sv << nr;
std::filesystem::path gamepad_path { ss.str() }; auto gamepad_path = platf::appdata() / ss.str();
if(std::filesystem::is_symlink(gamepad_path)) { if(std::filesystem::is_symlink(gamepad_path)) {
std::filesystem::remove(gamepad_path); std::filesystem::remove(gamepad_path);
} }
@@ -642,7 +646,7 @@ public:
std::stringstream ss; std::stringstream ss;
ss << "sunshine_gamepad_"sv << nr; ss << "sunshine_gamepad_"sv << nr;
std::filesystem::path gamepad_path { ss.str() }; auto gamepad_path = platf::appdata() / ss.str();
if(std::filesystem::is_symlink(gamepad_path)) { if(std::filesystem::is_symlink(gamepad_path)) {
std::filesystem::remove(gamepad_path); std::filesystem::remove(gamepad_path);
@@ -854,6 +858,7 @@ void broadcastRumble(safe::queue_t<mail_evdev_t> &rumble_queue_queue) {
// There may be an attepmt to remove, that which not exists // There may be an attepmt to remove, that which not exists
if(!rumble_queue) { if(!rumble_queue) {
BOOST_LOG(warning) << "Attempting to remove a gamepad device from notifications that isn't already registered"sv;
continue; continue;
} }
} }