From d9fd10fe23c7897e7db24d0709f6458cf094a5b7 Mon Sep 17 00:00:00 2001
From: Madpeterz <57852827+Madpeterz@users.noreply.github.com>
Date: Mon, 15 Feb 2021 03:37:09 +0000
Subject: [PATCH] corrects betterAtHome for non discord-V users

---
 BetterSecondbot/CliExitOnLogout.cs                 | 12 ++++++++----
 BetterSecondbot/DiscordSupervisor/Discord-super.cs |  3 +--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/BetterSecondbot/CliExitOnLogout.cs b/BetterSecondbot/CliExitOnLogout.cs
index 6720633..5061b37 100644
--- a/BetterSecondbot/CliExitOnLogout.cs
+++ b/BetterSecondbot/CliExitOnLogout.cs
@@ -5,7 +5,8 @@ using BetterSecondBotShared.Static;
 using BetterSecondBot.bottypes;
 using System.Threading;
 using static BetterSecondBot.Program;
-
+using BetterSecondbot.BetterAtHome;
+
 namespace BetterSecondBot
 {
     public class CliExitOnLogout
@@ -13,15 +14,16 @@ namespace BetterSecondBot
         public bool Exited { get { return exitBot; } }
         protected bool exitBot = false;
         public SecondBot Bot;
+        protected BetterAtHome betterAtHomeService;
 
         protected void keep_alive()
         {
             while (Bot.KillMe == false)
             {
                 string NewStatusMessage = Bot.GetStatus();
+                NewStatusMessage = NewStatusMessage.Trim();
                 if (NewStatusMessage != Bot.LastStatusMessage)
                 {
-                    NewStatusMessage = NewStatusMessage.Trim();
                     if (NewStatusMessage.Replace(" ", "") != "")
                     {
                         Bot.LastStatusMessage = NewStatusMessage;
@@ -30,6 +32,7 @@ namespace BetterSecondBot
                 }
                 Thread.Sleep(1000);
             }
+            betterAtHomeService = null;
         }
         public CliExitOnLogout(JsonConfig Config, bool as_docker, bool use_self_keep_alive)
         {
@@ -38,8 +41,9 @@ namespace BetterSecondBot
             if (helpers.botRequired(Config) == true)
             {
                 Bot = new SecondBot();
-                Bot.Setup(Config, AssemblyInfo.GetGitHash());
-                if(as_docker == true)
+                Bot.Setup(Config, AssemblyInfo.GetGitHash());
+                betterAtHomeService = new BetterAtHome(this, Config);
+                if (as_docker == true)
                 {
                     Bot.AsDocker();
                 }
diff --git a/BetterSecondbot/DiscordSupervisor/Discord-super.cs b/BetterSecondbot/DiscordSupervisor/Discord-super.cs
index e264b9c..4f67f73 100644
--- a/BetterSecondbot/DiscordSupervisor/Discord-super.cs
+++ b/BetterSecondbot/DiscordSupervisor/Discord-super.cs
@@ -13,7 +13,7 @@ namespace BetterSecondBot.DiscordSupervisor
     {
         protected int warmup = 0;
         protected BetterRelay relayService;
-        protected BetterAtHome betterAtHomeService;
+        
         protected override void keep_alive()
         {
             while (exit_super == false)
@@ -85,7 +85,6 @@ namespace BetterSecondBot.DiscordSupervisor
             controler = new CliExitOnLogout(myconfig, running_as_docker, self_keep_alive);
             controler.Bot.setDiscordClient(DiscordClient);
             relayService = new BetterRelay(controler, this, running_as_docker);
-            betterAtHomeService = new BetterAtHome(controler, myconfig);
             attach_events();
         }