jyapayne/Sunshine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix segfault when multiple controllers connected

Browse source
This commit is contained in:
loki-47-6F-64 2021-09-27 19:35:06 +02:00
commit 1f7bdb1b2a
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sunshine/platform/linux/input.cpp
View file

@ -696,7 +696,13 @@ public:
}; };
inline void rumbleIterate(std::vector<effect_t> &effects, std::vector<pollfd_t> &polls, std::chrono::milliseconds to) { inline void rumbleIterate(std::vector<effect_t> &effects, std::vector<pollfd_t> &polls, std::chrono::milliseconds to) {
auto res = poll(&polls.data()->el, polls.size(), to.count()); std::vector<pollfd> polls_tmp;
polls_tmp.reserve(polls.size());
for(auto &poll : polls) {
polls_tmp.emplace_back(poll.el);
}
auto res = poll(polls_tmp.data(), polls.size(), to.count());
// If timed out // If timed out
if(!res) { if(!res) {
@ -871,7 +877,7 @@ void broadcastRumble(safe::queue_t<mail_evdev_t> &rumble_queue_queue) {
} }
if(polls.empty()) { if(polls.empty()) {
std::this_thread::sleep_for(50ms); std::this_thread::sleep_for(250ms);
} }
else { else {
rumbleIterate(effects, polls, 100ms); rumbleIterate(effects, polls, 100ms);