diff --git a/NEWS.rst b/NEWS.rst index 9b816997..256168cd 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -3,7 +3,6 @@ News * jackdbus 2.23.2 (2024-MM-DD) - * Stop recurrent wakeups when no save is pending (Stefan Bruens) * Upgrade waf to 2.1.2 * jackdbus 2.23.1 (2024-06-13) diff --git a/dbus/controller.c b/dbus/controller.c index 78b87555..1430994f 100644 --- a/dbus/controller.c +++ b/dbus/controller.c @@ -720,7 +720,7 @@ jack_controller_destroy( free(controller_ptr); } -bool +void jack_controller_run( void * context) { @@ -728,7 +728,7 @@ jack_controller_run( if (controller_ptr->pending_save == 0) { - return false; + return; } if (sysinfo(&si) != 0) @@ -737,12 +737,11 @@ jack_controller_run( } else if (si.uptime < controller_ptr->pending_save + 2) /* delay save by two seconds */ { - return true; + return; } controller_ptr->pending_save = 0; jack_controller_settings_save_auto(controller_ptr); - return false; } #undef controller_ptr diff --git a/dbus/controller.h b/dbus/controller.h index 0294ca2e..1db79ecd 100644 --- a/dbus/controller.h +++ b/dbus/controller.h @@ -20,13 +20,11 @@ #ifndef CONTROLLER_H__2CC80B1E_8D5D_45E3_A9D8_9086DDF68BB5__INCLUDED #define CONTROLLER_H__2CC80B1E_8D5D_45E3_A9D8_9086DDF68BB5__INCLUDED -#include - void * jack_controller_create( DBusConnection *connection); -bool +void jack_controller_run( void *controller_ptr); diff --git a/dbus/jackdbus.c b/dbus/jackdbus.c index 2e331f2b..b6e2698d 100644 --- a/dbus/jackdbus.c +++ b/dbus/jackdbus.c @@ -857,7 +857,6 @@ main (int argc, char **argv) void *controller_ptr; struct stat st; char timestamp_str[26]; - bool save_pending; st.st_mtime = 0; stat(argv[0], &st); @@ -955,10 +954,9 @@ main (int argc, char **argv) jack_info("Listening for D-Bus messages"); g_exit_command = FALSE; - save_pending = false; - while (!g_exit_command && dbus_connection_read_write_dispatch (g_connection, (save_pending ? 200 : -1))) + while (!g_exit_command && dbus_connection_read_write_dispatch (g_connection, 200)) { - save_pending = jack_controller_run(controller_ptr); + jack_controller_run(controller_ptr); } jack_controller_destroy(controller_ptr);