fix unclean exit after failed login

d99kris · Jun 8, 2024 · 8a1710b · 8a1710b
1 parent 09fc235
commit 8a1710b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 19 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -147,7 +147,7 @@ int main(int argc, char* argv[])
   Log::SetPath(logPath);
 
   THREAD_REGISTER();
-  Util::RegisterSignalHandlers();
+  Util::InitAppSignalHandlers();
 
   const std::string appVersion = Version::GetUiAppVersion();
   LOG_INFO("%s", appVersion.c_str());

diff --git 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" "May 2024" "nmail v4.65" "User Commands"
+.TH NMAIL "1" "June 2024" "nmail v4.66" "User Commands"
 .SH NAME
 nmail \- ncurses mail
 .SH SYNOPSIS

diff --git a/src/ui.cpp b/src/ui.cpp
@@ -2021,7 +2021,7 @@ void Ui::Run()
   DrawAll();
   int64_t uiIdleTime = 0;
   LOG_INFO("entering ui loop");
-  Util::RegisterIgnoredSignalHandlers(); // ignore ctrl-c while ui is running
+  Util::InitUiSignalHandlers();
   raw();
 
   while (s_Running)
@@ -2126,7 +2126,7 @@ void Ui::Run()
   }
 
   noraw();
-  Util::RestoreIgnoredSignalHandlers();
+  Util::CleanupUiSignalHandlers();
   LOG_INFO("exiting ui loop");
 
   return;

diff --git a/src/util.cpp b/src/util.cpp
@@ -1411,7 +1411,6 @@ std::map<int, std::string> Util::GetIgnoredSignals()
 {
   static const std::map<int, std::string> ignoredSignals =
   {
-    { SIGINT, "SIGINT" },
     { SIGPIPE, "SIGPIPE" },
   };
   return ignoredSignals;
@@ -1424,7 +1423,7 @@ std::string Util::GetSigName(int p_Signal)
   return (it != signames.end()) ? it->second : std::to_string(p_Signal);
 }
 
-void Util::RegisterSignalHandlers()
+void Util::InitAppSignalHandlers()
 {
   const std::map<int, std::string>& crashingSignals = GetCrashingSignals();
   for (const auto& crashingSignal : crashingSignals)
@@ -1437,24 +1436,22 @@ void Util::RegisterSignalHandlers()
   {
     signal(terminatingSignal.first, SignalTerminateHandler);
   }
-}
 
-void Util::RegisterIgnoredSignalHandlers()
-{
   const std::map<int, std::string>& ignoredSignals = GetIgnoredSignals();
   for (const auto& ignoredSignal : ignoredSignals)
   {
     signal(ignoredSignal.first, SIG_IGN);
   }
 }
 
-void Util::RestoreIgnoredSignalHandlers()
+void Util::InitUiSignalHandlers()
 {
-  const std::map<int, std::string>& ignoredSignals = GetIgnoredSignals();
-  for (const auto& ignoredSignal : ignoredSignals)
-  {
-    signal(ignoredSignal.first, SIG_DFL);
-  }
+  signal(SIGINT, SIG_IGN);
+}
+
+void Util::CleanupUiSignalHandlers()
+{
+  signal(SIGINT, SIG_DFL);
 }
 
 void Util::SignalCrashHandler(int p_Signal)

diff --git a/src/util.h b/src/util.h
@@ -221,9 +221,9 @@ class Util
   static std::string FromOctString(const std::string& p_Str);
   static void HexToRGB(const std::string p_Str, uint32_t& p_R, uint32_t& p_G, uint32_t& p_B);
 
-  static void RegisterSignalHandlers();
-  static void RegisterIgnoredSignalHandlers();
-  static void RestoreIgnoredSignalHandlers();
+  static void InitAppSignalHandlers();
+  static void InitUiSignalHandlers();
+  static void CleanupUiSignalHandlers();
   static void SignalCrashHandler(int p_Signal);
   static void SignalTerminateHandler(int p_Signal);
 

diff --git a/src/version.cpp b/src/version.cpp
@@ -7,7 +7,7 @@
 
 #include "version.h"
 
-#define NMAIL_VERSION "4.65"
+#define NMAIL_VERSION "4.66"
 
 std::string Version::GetBuildOs()
 {