From 2ae9560cb25508211e0335ab956a3521c5fda9b2 Mon Sep 17 00:00:00 2001 From: Kristofer Berggren Date: Sat, 10 Aug 2024 08:30:54 +0800 Subject: [PATCH] avoid logging warnings for minor user-triggered events --- src/nmail.1 | 2 +- src/ui.cpp | 24 ++++++++++++++++++++---- src/version.cpp | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/nmail.1 b/src/nmail.1 index 35245d1..79afe7d 100644 --- a/src/nmail.1 +++ b/src/nmail.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man. -.TH NMAIL "1" "August 2024" "nmail 5.1.11" "User Commands" +.TH NMAIL "1" "August 2024" "nmail 5.1.12" "User Commands" .SH NAME nmail \- ncurses mail .SH SYNOPSIS diff --git a/src/ui.cpp b/src/ui.cpp index 63ab9f3..253ad41 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -2605,12 +2605,28 @@ void Ui::ViewMessageListKeyHandler(int p_Key) else if (p_Key == m_KeyExtHtmlViewer) { UpdateUidFromIndex(true /* p_UserTriggered */); - ExtHtmlViewer(); + const int uid = m_CurrentFolderUid.second; + if (uid != -1) + { + ExtHtmlViewer(); + } + else + { + SetDialogMessage("No message to view"); + } } else if (p_Key == m_KeyExtMsgViewer) { UpdateUidFromIndex(true /* p_UserTriggered */); - ExtMsgViewer(); + const int uid = m_CurrentFolderUid.second; + if (uid != -1) + { + ExtMsgViewer(); + } + else + { + SetDialogMessage("No message to view"); + } } else if ((p_Key == m_KeyFilterSortReset) && !m_MessageListSearch) { @@ -5999,13 +6015,13 @@ void Ui::StartSync() { if (m_SyncState != SyncStateIdle) { - SetDialogMessage("Sync already in progress", true /* p_Warn */); + SetDialogMessage("Sync already in progress"); return; } if (!IsConnected()) { - SetDialogMessage("Cannot sync while offline", true /* p_Warn */); + SetDialogMessage("Cannot sync while offline"); return; } diff --git a/src/version.cpp b/src/version.cpp index e825d78..54ae140 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -7,7 +7,7 @@ #include "version.h" -#define NMAIL_VERSION "5.1.11" +#define NMAIL_VERSION "5.1.12" std::string Version::GetBuildOs() {