Fix rooms option in triggers, fix [unassigned] name (hopefully)

Steam-Chat-Bot · Sep 25, 2016 · 9b6254b · 9b6254b
1 parent 7971f1d
commit 9b6254b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/SteamChatBot/Bot.cs b/SteamChatBot/Bot.cs
@@ -244,6 +244,7 @@ private static void SubForCB()
             manager.Subscribe<SteamUser.LoggedOnCallback>(OnLoggedOn);
             manager.Subscribe<SteamUser.LoggedOffCallback>(OnLoggedOff);
             manager.Subscribe<SteamUser.UpdateMachineAuthCallback>(OnUpdateMachineAuth);
+            manager.Subscribe<SteamUser.LoginKeyCallback>(OnLoginKeyCallback);
 
             manager.Subscribe<SteamFriends.ChatMsgCallback>(OnChatMsg);
             manager.Subscribe<SteamFriends.FriendMsgCallback>(OnFriendMsg);
@@ -254,6 +255,12 @@ private static void SubForCB()
             Log.Instance.Silly("Callback managers subscribed");
         }
 
+        private static void OnLoginKeyCallback(SteamUser.LoginKeyCallback callback)
+        {
+            steamFriends.SetPersonaState(EPersonaState.Online);
+            steamFriends.SetPersonaName(displayName);
+        }
+
         private static void OnFriendMsg(SteamFriends.FriendMsgCallback callback)
         {
             if (callback.EntryType == EChatEntryType.ChatMsg)
@@ -333,8 +340,6 @@ private static void OnLoggedOn(SteamUser.LoggedOnCallback callback)
             if (callback.Result == EResult.OK)
             {
                 Log.Instance.Info("Logged in!");
-                steamFriends.SetPersonaState(EPersonaState.Online);
-                steamFriends.SetPersonaName(displayName);
                 foreach (BaseTrigger trigger in triggers)
                 {
                     trigger.OnLoggedOn();

diff --git a/SteamChatBot/Triggers/BaseTrigger.cs b/SteamChatBot/Triggers/BaseTrigger.cs
@@ -940,12 +940,12 @@ protected bool CheckRoom(SteamID toID)
                 for (int i = 0; i < rooms.Count; i++)
                 {
                     SteamID room = rooms[i];
-                    if (toID == room)
+                    if (toID == SteamHelper.ToChatID(room))
                     {
                         return true;
                     }
                 }
-                return true;
+                return false;
             }
         }
 

diff --git a/SteamChatBot/Triggers/TriggerOptions/Windows/NoteTriggerOptionsWindow.xaml.cs b/SteamChatBot/Triggers/TriggerOptions/Windows/NoteTriggerOptionsWindow.xaml.cs
@@ -49,7 +49,7 @@ private void doneButton_Click(object sender, RoutedEventArgs e)
                 if (noteCommandBox.Text != "") NTO.NoteCommand = noteCommandBox.Text;
                 if (infoCommandBox.Text != "") NTO.InfoCommand = infoCommandBox.Text;
                 if (deleteCommandBox.Text != "") NTO.DeleteCommand = deleteCommandBox.Text;
-                if (saveTimerBox.Text != "") NTO.SaveTimer = Convert.ToInt32(saveTimerBox.Text);
+                if (saveTimerBox.Text != "" || Convert.ToInt32(saveTimerBox.Text) == 0) NTO.SaveTimer = Convert.ToInt32(saveTimerBox.Text);
                 if (noteFileBox.Text != "") NTO.NoteFile = noteFileBox.Text;
                 if (notesCommandBox.Text != "") NTO.NotesCommand = notesCommandBox.Text;