Some cleanups

src/irc/irc_client.cpp

@@ -942,7 +942,7 @@ void IrcClient::on_nick(const IrcMessage& message)
 {
   const std::string new_nick = IrcUser(message.arguments[0]).nick;
   const std::string current_nick = IrcUser(message.prefix).nick;
-  const auto change_nick_func = [&](const std::string& chan_name, const IrcChannel* channel)
+  const auto change_nick_func = [this, &new_nick, &current_nick](const std::string& chan_name, const IrcChannel* channel)
   {
     IrcUser* user;
     if (channel->get_self() && channel->get_self()->nick == current_nick)

src/main.cpp

@@ -14,9 +14,9 @@
 #include <signal.h>
 
 // A flag set by the SIGINT signal handler.
-static volatile std::atomic<bool> stop(false);
+static std::atomic<bool> stop(false);
 // Flag set by the SIGUSR1/2 signal handler.
-static volatile std::atomic<bool> reload(false);
+static std::atomic<bool> reload(false);
 // A flag indicating that we are wanting to exit the process. i.e: if this
 // flag is set and all connections are closed, we can exit properly.
 static bool exiting = false;