diff --git a/BetterSecondbot/BetterRelayService/BetterRelay.cs b/BetterSecondbot/BetterRelayService/BetterRelay.cs index b831ae0..da09955 100644 --- a/BetterSecondbot/BetterRelayService/BetterRelay.cs +++ b/BetterSecondbot/BetterRelayService/BetterRelay.cs @@ -148,17 +148,26 @@ namespace BetterSecondBot.BetterRelayService public void unattach_events() { - controler.getBot().MessageEvent -= SLMessageHandler; - superV.MessageEvent -= DiscordMessageHandler; + if (superV != null) + { + superV.MessageEvent -= DiscordMessageHandler; + } + if (controler.getBot() != null) + { + controler.getBot().MessageEvent -= SLMessageHandler; + } } protected void attach_events() { - controler.getBot().MessageEvent += SLMessageHandler; if (superV != null) { superV.MessageEvent += DiscordMessageHandler; } + if (controler.getBot() != null) + { + controler.getBot().MessageEvent += SLMessageHandler; + } } protected HttpClient HTTPclient = new HttpClient(); diff --git a/BetterSecondbot/DiscordSupervisor/DiscordEvents.cs b/BetterSecondbot/DiscordSupervisor/DiscordEvents.cs index 809690c..1525619 100644 --- a/BetterSecondbot/DiscordSupervisor/DiscordEvents.cs +++ b/BetterSecondbot/DiscordSupervisor/DiscordEvents.cs @@ -10,18 +10,24 @@ namespace BetterSecondBot.DiscordSupervisor protected StatusMessageEvent LastNetworkEventArgs = null; protected void attach_events() { - controler.getBot().MessageEvent += BotChatControlerHandler; - controler.getBot().StatusMessageEvent += StatusMessageHandler; - controler.getBot().GroupsReadyEvent += GroupsReadyHandler; - controler.getBot().SendImEvent += SendImHandler; + if (controler.getBot() != null) + { + controler.getBot().MessageEvent += BotChatControlerHandler; + controler.getBot().StatusMessageEvent += StatusMessageHandler; + controler.getBot().GroupsReadyEvent += GroupsReadyHandler; + controler.getBot().SendImEvent += SendImHandler; + } } protected void unattach_events() { - controler.getBot().MessageEvent -= BotChatControlerHandler; - controler.getBot().StatusMessageEvent -= StatusMessageHandler; - controler.getBot().GroupsReadyEvent -= GroupsReadyHandler; - controler.getBot().SendImEvent -= SendImHandler; + if (controler.getBot() != null) + { + controler.getBot().MessageEvent -= BotChatControlerHandler; + controler.getBot().StatusMessageEvent -= StatusMessageHandler; + controler.getBot().GroupsReadyEvent -= GroupsReadyHandler; + controler.getBot().SendImEvent -= SendImHandler; + } } protected void SendImHandler(object sender, ImSendArgs e)