drath/libratbag
1
0
Fork 1
mirror of https://github.com/libratbag/libratbag.git synced 2026-11-07 15:14:38 +01:00
Code Issues Projects Releases Wiki Activity

RatbagdButton: fix missed dbus return value

Browse Source 
I missed this one in #336.
This commit is contained in:
Jente Hidskes
2017-09-16 11:53:41 +02:00
committed by Peter Hutterer
parent 52e10d029f
commit db34ab5255
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ratbagd/ratbagd-button.c
View File

@@ -242,8 +242,11 @@ static int ratbagd_button_set_macro(sd_bus *bus,
macro = ratbag_button_macro_new("macro");
while ((r = sd_bus_message_read(m, "(uu)", &type, &value)) > 0) {
r = ratbag_button_macro_set_event(macro, idx++, type, value);
if (r < 0)
return r;
if (r < 0) {
r = ratbagd_device_resync(button->device, bus);
if (r < 0)
return r;
}
}
if (r < 0)
return r;
@@ -253,8 +256,11 @@ static int ratbagd_button_set_macro(sd_bus *bus,
return r;
r = ratbag_button_set_macro(button->lib_button, macro);
if (r < 0)
return r;
if (r < 0) {
r = ratbagd_device_resync(button->device, bus);
if (r < 0)
return r;
}
if (r == 0) {
sd_bus *bus = sd_bus_message_get_bus(m);
@@ -271,7 +277,7 @@ static int ratbagd_button_set_macro(sd_bus *bus,
NULL);
}
return r;
return 0;
}
static int ratbagd_button_get_action_type(sd_bus *bus,