From 60444ee81c5d9de5d837bf525e5fcc0617d96887 Mon Sep 17 00:00:00 2001
From: Tim Young <tim.young@lightsys.org>
Date: Mon, 31 Jul 2017 16:36:07 -0500
Subject: [PATCH] fix small glitch where it kept wanting us to select a new
 language.

---
 EduNetworkBuilder/NBSettings.cs        | 13 ++++++++++---
 EduNetworkBuilder/PersonProfileForm.cs |  5 +++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/EduNetworkBuilder/NBSettings.cs b/EduNetworkBuilder/NBSettings.cs
index df98617..639898c 100644
--- a/EduNetworkBuilder/NBSettings.cs
+++ b/EduNetworkBuilder/NBSettings.cs
@@ -227,11 +227,18 @@ namespace EduNetworkBuilder
             {
                 if (Properties.Settings.Default.ScoreList == null)
                     Properties.Settings.Default.ScoreList = new System.Collections.Specialized.StringCollection();
-
+                if(NB.GetUser() == null)
+                {
+                    Properties.Settings.Default.AutoStartPuzzles = AutoStartPuzzles;
+                    Properties.Settings.Default.LanguageHasBeenChosen = LanguageHasBeenChosen;
+                }
+                else
+                {
+                    Properties.Settings.Default.AutoStartPuzzles = AutoStartPuzzles;
+                    Properties.Settings.Default.LanguageHasBeenChosen = LanguageHasBeenChosen;
+                }
                 Properties.Settings.Default.LastPath = LastPath;
-                Properties.Settings.Default.AutoStartPuzzles = AutoStartPuzzles;
                 Properties.Settings.Default.ChosenLanguage = ChosenLanguage;
-                Properties.Settings.Default.LanguageHasBeenChosen = LanguageHasBeenChosen;
                 Properties.Settings.Default.MainWindowX = MainWindowX;
                 Properties.Settings.Default.MainWindowY = MainWindowY;
                 Properties.Settings.Default.MainWindowHeight = MainWindowHeight;
diff --git a/EduNetworkBuilder/PersonProfileForm.cs b/EduNetworkBuilder/PersonProfileForm.cs
index 16e2c42..c704090 100644
--- a/EduNetworkBuilder/PersonProfileForm.cs
+++ b/EduNetworkBuilder/PersonProfileForm.cs
@@ -62,6 +62,8 @@ namespace EduNetworkBuilder
             if (CurrentUser == null && FileName == "")
             {
                 //Prompt for a username
+                NBSettings oldsettings = NB.GetSettings(); //Grab the old settings.
+
                 String Dest = NB.TextPromptBox(NB.Translate("PPF_EnterUserName"));
                 if (Dest == "") { Close(); return; }//No name given or canceled.
                 if (Dest == null) { Close(); return; }
@@ -76,6 +78,9 @@ namespace EduNetworkBuilder
                 OFD.FileName = NB.Translate("PPF_SelectThisFolder"); 
                 OFD.ShowDialog();
                 CurrentUser.filepath = Path.GetDirectoryName(OFD.FileName);
+                CurrentUser.UserSettings.AutoStartPuzzles = false;
+                CurrentUser.UserSettings.ChosenLanguage = oldsettings.ChosenLanguage;
+                CurrentUser.UserSettings.LanguageHasBeenChosen = true;
             }
             else if (CurrentUser == null)
             {