From dba183376f946db1b32082f4d9742ba8cf95c23d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 6 Sep 2024 15:00:10 +0200 Subject: [PATCH] {FileBrowser,Lyrics}Page: remove useless "Aborted" messages What's the point of this message? The user knows they aborted the command. --- src/FileBrowserPage.cxx | 5 +---- src/LyricsPage.cxx | 4 +--- src/save_playlist.cxx | 4 +--- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/FileBrowserPage.cxx b/src/FileBrowserPage.cxx index a59d189c..97f19c85 100644 --- a/src/FileBrowserPage.cxx +++ b/src/FileBrowserPage.cxx @@ -247,11 +247,8 @@ FileBrowserPage::HandleDelete(struct mpdclient &c) noexcept _("Delete playlist %s?"), Utf8ToLocaleZ{GetUriFilename(mpd_playlist_get_path(playlist))}.c_str()); bool confirmed = screen_get_yesno(screen, prompt, false); - if (!confirmed) { - /* translators: a dialog was aborted by the user */ - screen_status_message(_("Aborted")); + if (!confirmed) return; - } if (!mpd_run_rm(connection, mpd_playlist_get_path(playlist))) { c.HandleError(); diff --git a/src/LyricsPage.cxx b/src/LyricsPage.cxx index 6d7a24c1..1b827021 100644 --- a/src/LyricsPage.cxx +++ b/src/LyricsPage.cxx @@ -353,10 +353,8 @@ LyricsPage::Edit() const char *prompt = _("Do you really want to start an editor and edit these lyrics?"); bool really = screen_get_yesno(screen, prompt, false); - if (!really) { - screen_status_message(_("Aborted")); + if (!really) return; - } } if (!Save()) diff --git a/src/save_playlist.cxx b/src/save_playlist.cxx index 344a39a5..13c167dc 100644 --- a/src/save_playlist.cxx +++ b/src/save_playlist.cxx @@ -93,10 +93,8 @@ playlist_save(ScreenManager &screen, struct mpdclient &c, snprintf(prompt, sizeof(prompt), _("Replace %s?"), filename.c_str()); bool replace = screen_get_yesno(screen, prompt, false); - if (!replace) { - screen_status_message(_("Aborted")); + if (!replace) return -1; - } if (!mpd_run_rm(connection, filename_utf8.c_str()) || !mpd_run_save(connection, filename_utf8.c_str())) {