diff --git a/meson.build b/meson.build index f6fd435..dc0d591 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('gsr-ui', ['c', 'cpp'], version : '1.7.6', default_options : ['warning_level=2', 'cpp_std=c++17'], subproject_dir : 'depends') +project('gsr-ui', ['c', 'cpp'], version : '1.7.7', default_options : ['warning_level=2', 'cpp_std=c++17'], subproject_dir : 'depends') add_project_arguments('-D_FILE_OFFSET_BITS=64', language : ['c', 'cpp']) @@ -65,7 +65,7 @@ datadir = get_option('datadir') gsr_ui_resources_path = join_paths(prefix, datadir, 'gsr-ui') add_project_arguments('-DGSR_UI_VERSION="' + meson.project_version() + '"', language: ['c', 'cpp']) -add_project_arguments('-DGSR_FLATPAK_VERSION="5.8.1"', language: ['c', 'cpp']) +add_project_arguments('-DGSR_FLATPAK_VERSION="5.8.2"', language: ['c', 'cpp']) executable( meson.project_name(), diff --git a/project.conf b/project.conf index 924cd04..6104ddf 100644 --- a/project.conf +++ b/project.conf @@ -1,7 +1,7 @@ [package] name = "gsr-ui" type = "executable" -version = "1.7.6" +version = "1.7.7" platforms = ["posix"] [lang.cpp] diff --git a/src/Overlay.cpp b/src/Overlay.cpp index d96fc66..19e5941 100644 --- a/src/Overlay.cpp +++ b/src/Overlay.cpp @@ -512,7 +512,7 @@ namespace gsr { hide(); if(notification_process > 0) { - kill(notification_process, SIGKILL); + kill(notification_process, SIGINT); int status; if(waitpid(notification_process, &status, 0) == -1) { perror("waitpid failed"); @@ -1700,7 +1700,7 @@ namespace gsr { notification_args[arg_index++] = nullptr; if(notification_process > 0) { - kill(notification_process, SIGKILL); + kill(notification_process, SIGINT); int status = 0; waitpid(notification_process, &status, 0); } @@ -1828,8 +1828,6 @@ namespace gsr { result += std::to_string(seconds) + " second" + (seconds == 1 ? "" : "s"); } - fprintf(stderr, "to duration string: %f, %d, %d, %d\n", duration_sec, seconds, minutes, hours); - return result; }