Fix bugs

...and get rid of all == false and == true

8 files changed, 106 insertions, 97 deletions

diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs
index e330ea0..2a26b91 100644
--- a/Histacom2/OS/Win95/Win95.cs
+++ b/Histacom2/OS/Win95/Win95.cs
@@ -114,7 +114,7 @@ namespace Histacom2.OS.Win95
             this.BringToFront();
 
             //Check if it is the first time
-            if (CurrentSave.FTime95 == false)
+            if (!CurrentSave.FTime95)
             {
                 CurrentSave.FTime95 = true;
                 SaveGame();
diff --git a/Histacom2/OS/Win95/Win95Apps/MineSweeper/Square.cs b/Histacom2/OS/Win95/Win95Apps/MineSweeper/Square.cs
index 4f80240..2ebb319 100644
--- a/Histacom2/OS/Win95/Win95Apps/MineSweeper/Square.cs
+++ b/Histacom2/OS/Win95/Win95Apps/MineSweeper/Square.cs
@@ -108,7 +108,7 @@ namespace Histacom2.OS.Win95.Win95Apps.MineSweeper
                     this.Open();
                 }
             }
-            if (_game.ftime == true && !Minded)
+            if (_game.ftime && !Minded)
             {
                 _game.ftime = false;
                 _game._timer = new Timer();
diff --git a/Histacom2/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs b/Histacom2/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs
index 2a03c7e..958e8a0 100644
--- a/Histacom2/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs
+++ b/Histacom2/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs
@@ -129,7 +129,7 @@ namespace Histacom2.OS.Win95.Win95Apps
 
         private void timer1_Tick(object sender, EventArgs e)
         {
-            if (_game.win == true)
+            if (_game.win)
             {
                 button1.BackgroundImage = Properties.Resources.WinClassicMinesweeperWin;
                 switch (level)
diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs
index 41f7c35..7cf9dd4 100644
--- a/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs
@@ -74,7 +74,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story
         
         public static void CheckIfSoundFinished(Object sender, EventArgs e)
         {
-            if (soundThread.IsAlive == false)
+            if (!soundThread.IsAlive)
             {
                 // Continue from where we were
                 System.Windows.Forms.Timer trm = sender as System.Windows.Forms.Timer;
diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
index 2a96033..a4bd611 100644
--- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
@@ -53,13 +53,13 @@
             this.toprightcorner = new System.Windows.Forms.Panel();
             this.topleftcorner = new System.Windows.Forms.Panel();
             this.pnlSave = new System.Windows.Forms.Panel();
+            this.refresh = new System.Windows.Forms.Timer(this.components);
+            this.btnCanc = new Histacom2.Engine.UI.ClassicButton();
             this.cmbType = new Histacom2.Engine.UI.ClassicDropDown();
             this.txtSave = new Histacom2.Engine.UI.ClassicTextBox();
             this.classicLabel2 = new Histacom2.Engine.UI.ClassicLabel();
             this.classicLabel1 = new Histacom2.Engine.UI.ClassicLabel();
             this.btnSave = new Histacom2.Engine.UI.ClassicButton();
-            this.refresh = new System.Windows.Forms.Timer(this.components);
-            this.btnCanc = new Histacom2.Engine.UI.ClassicButton();
             this.program.SuspendLayout();
             this.MenuStrip1.SuspendLayout();
             this.pnlSave.SuspendLayout();
@@ -276,8 +276,33 @@
             this.pnlSave.TabIndex = 18;
             this.pnlSave.Visible = false;
             // 
+            // refresh
+            // 
+            this.refresh.Interval = 15000;
+            this.refresh.Tick += new System.EventHandler(this.refresh_Tick);
+            // 
+            // btnCanc
+            // 
+            this.btnCanc.AdaptBackColorWithTheme = true;
+            this.btnCanc.AdaptFontWithTheme = true;
+            this.btnCanc.AdaptForeColorWithTheme = true;
+            this.btnCanc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCanc.BackColor = System.Drawing.Color.Silver;
+            this.btnCanc.DialogResult = System.Windows.Forms.DialogResult.None;
+            this.btnCanc.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.btnCanc.ForeColor = System.Drawing.Color.Black;
+            this.btnCanc.Location = new System.Drawing.Point(611, 27);
+            this.btnCanc.Name = "btnCanc";
+            this.btnCanc.Size = new System.Drawing.Size(75, 25);
+            this.btnCanc.TabIndex = 24;
+            this.btnCanc.Text = "Cancel";
+            this.btnCanc.Click += new System.EventHandler(this.btnCanc_Click);
+            // 
             // cmbType
             // 
+            this.cmbType.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbType.BackColor = System.Drawing.Color.White;
             this.cmbType.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
             this.cmbType.Location = new System.Drawing.Point(56, 31);
@@ -333,26 +358,6 @@
             this.btnSave.Text = "Save";
             this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
             // 
-            // refresh
-            // 
-            this.refresh.Interval = 15000;
-            this.refresh.Tick += new System.EventHandler(this.refresh_Tick);
-            // 
-            // btnCanc
-            // 
-            this.btnCanc.AdaptBackColorWithTheme = true;
-            this.btnCanc.AdaptFontWithTheme = true;
-            this.btnCanc.AdaptForeColorWithTheme = true;
-            this.btnCanc.BackColor = System.Drawing.Color.Silver;
-            this.btnCanc.DialogResult = System.Windows.Forms.DialogResult.None;
-            this.btnCanc.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
-            this.btnCanc.ForeColor = System.Drawing.Color.Black;
-            this.btnCanc.Location = new System.Drawing.Point(611, 27);
-            this.btnCanc.Name = "btnCanc";
-            this.btnCanc.Size = new System.Drawing.Size(75, 25);
-            this.btnCanc.TabIndex = 24;
-            this.btnCanc.Text = "Cancel";
-            // 
             // Win95WindowsExplorer
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
index f118542..0f221af 100644
--- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
@@ -109,14 +109,14 @@ namespace Histacom2.OS.Win95.Win95Apps
                 IsFileSaveDialog = true;
             }
 
-            if (IsFileOpenDialog == true)
+            if (IsFileOpenDialog)
             {
                 pnlSave.Show();
                 btnSave.Text = "Open";
             }
             else
             {
-                if (IsFileSaveDialog == true)
+                if (IsFileSaveDialog)
                 {
                     pnlSave.Show();
                     btnSave.Text = "Save";
@@ -133,9 +133,9 @@ namespace Histacom2.OS.Win95.Win95Apps
             FileSystemFolderInfo toRead = new FileSystemFolderInfo();
             toRead = JsonConvert.DeserializeObject<FileSystemFolderInfo>(directoryFileInfo);
 
-            if (returnYesIfProtected == true)
+            if (returnYesIfProtected)
             {
-                if (toRead.IsProtected == true) return "yes";
+                if (toRead.IsProtected) return "yes";
             }
             else return toRead.Label;
             return Val;
@@ -717,28 +717,23 @@ namespace Histacom2.OS.Win95.Win95Apps
         {
             try
             {
-                bool OpenFile = false;
                 if (mainView.FocusedItem != null)
                 {
                     if (mainView.FocusedItem.Tag.ToString() == "")
                     { // If it isn't a file
                         GoToDir(Path.Combine(CurrentDirectory, mainView.FocusedItem.Tag.ToString()));
                     }
-                    else OpenFile = true; // If it is a file
+                    else txtSave.Text = mainView.FocusedItem.Tag.ToString();
                 }
-                else OpenFile = true;
-                if (OpenFile == true)
+                if (txtSave.Text == "") wm.StartInfobox95("Windows Explorer", "Please enter a filename", InfoboxType.Info, InfoboxButtons.OK);
+                else
                 {
-                    if (txtSave.Text == "") wm.StartInfobox95("Windows Explorer", "Please enter a filename", InfoboxType.Info, InfoboxButtons.OK);
-                    else
-                    {
-                        if (new FileInfo(Path.Combine(CurrentDirectory, txtSave.Text)).Extension == onlyViewExtension) Program.WindowsExplorerReturnPath = Path.Combine(CurrentDirectory, txtSave.Text);
+                    if (new FileInfo(Path.Combine(CurrentDirectory, txtSave.Text)).Extension == onlyViewExtension) Program.WindowsExplorerReturnPath = Path.Combine(CurrentDirectory, txtSave.Text);
 
-                        FileDialogBoxManager.IsInOpenDialog = false;
-                        FileDialogBoxManager.IsInSaveDialog = false;
+                    FileDialogBoxManager.IsInOpenDialog = false;
+                    FileDialogBoxManager.IsInSaveDialog = false;
 
-                        ((Form)this.TopLevelControl).Close();
-                    }
+                    ((Form)this.TopLevelControl).Close();
                 }
             }
             catch { }
@@ -1041,5 +1036,10 @@ namespace Histacom2.OS.Win95.Win95Apps
 
             RefreshTreeNode();
         }
+
+        private void btnCanc_Click(object sender, EventArgs e)
+        {
+            ((Form)this.TopLevelControl).Close();
+        }
     }
 }
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs
index 1a0836b..55a4ee2 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs
@@ -58,64 +58,67 @@ namespace Histacom2.OS.Win95.Win95Apps
 
         private void ftpItems_Click(object sender, EventArgs e)
         {
-            Point objDrawingPoint = ftpFiles.PointToClient(Cursor.Position);
-            ListViewItem objListViewItem = new ListViewItem();
-            if (objDrawingPoint != null)
+            try
             {
-                objListViewItem = ftpFiles.GetItemAt(objDrawingPoint.X, objDrawingPoint.Y);
-                if (objListViewItem.Text == "/software/")
+                Point objDrawingPoint = ftpFiles.PointToClient(Cursor.Position);
+                ListViewItem objListViewItem = new ListViewItem();
+                if (objDrawingPoint != null)
                 {
-                    ftpFiles.Clear();
-                    ListViewItem listViewItem1 = new ListViewItem(new string[] { "/downloads/" }, 0, Color.Black, Color.Empty, null);
-                    ListViewItem listViewItem2 = new ListViewItem(new string[] { "skindows.html" }, 1, Color.Black, Color.Empty, null);
-                    ftpFiles.Items.AddRange(new ListViewItem[] { listViewItem1, listViewItem2 });
-                }
-                else if (objListViewItem.Text == "/downloads/")
-                {
-                    ftpFiles.Clear();
-                    ListViewItem listViewItem1 = new ListViewItem(new string[] { "/totallynotthetimedistorter/" }, 0, Color.Black, Color.Empty, null);
-                    ListViewItem listViewItem2 = new ListViewItem(new string[] { "FTP Client Setup.exe" }, 2, Color.Black, Color.Empty, null);
-                    ListViewItem listViewItem3 = new ListViewItem(new string[] { "Web Chat Setup.exe" }, 2, Color.Black, Color.Empty, null);
-                    ListViewItem listViewItem4 = new ListViewItem(new string[] { "Guess The Number V1 Setup.exe" }, 2, Color.Black, Color.Empty, null);
-                    ftpFiles.Items.AddRange(new ListViewItem[] { listViewItem1, listViewItem2, listViewItem3, listViewItem4 });
-                }
-                else if (objListViewItem.Text == "/totallynotthetimedistorter/")
-                {
-                    ftpFiles.Clear();
-                    ListViewItem listViewItem1 = new ListViewItem(new string[] { "Time Distorter Setup.exe" }, 2, Color.Black, Color.Empty, null);
-                    ftpFiles.Items.AddRange(new ListViewItem[] { listViewItem1 });
-                }
-                else if (objListViewItem.Text == "FTP Client Setup.exe")
-                {
-                    WinClassicDownloader opendownload = new WinClassicDownloader();
-                    WindowManager wm = new WindowManager();
-                    wm.Init(opendownload, "Downloader", null, false, true);
-                    opendownload.appName.Text = "Downloading: FTP Client";
-                }
-                else if (objListViewItem.Text == "Web Chat Setup.exe")
-                {
-                    WinClassicDownloader opendownload = new WinClassicDownloader();
-                    WindowManager wm = new WindowManager();
-                    wm.Init(opendownload, "Downloader", null, false, true);
-                    opendownload.appName.Text = "Downloading: Web Chat 1998";
-                    opendownload.amountToDL = 35;
-                }
-                else if (objListViewItem.Text == "Time Distorter Setup.exe")
-                {
-                    WinClassicDownloader opendownload = new WinClassicDownloader();
-                    WindowManager wm = new WindowManager();
-                    wm.Init(opendownload, "Downloader", null, false, true);
-                    opendownload.appName.Text = "Downloading: Time Distorter 0.1";
-                }
-                else if (objListViewItem.Text == "Guess The Number V1 Setup.exe")
-                {
-                    WinClassicDownloader opendownload = new WinClassicDownloader();
-                    WindowManager wm = new WindowManager();
-                    wm.Init(opendownload, "Downloader", null, false, true);
-                    opendownload.appName.Text = "Downloading: Guess The Number V1";
-                    opendownload.amountToDL = 16;
+                    objListViewItem = ftpFiles.GetItemAt(objDrawingPoint.X, objDrawingPoint.Y);
+                    if (objListViewItem.Text == "/software/")
+                    {
+                        ftpFiles.Clear();
+                        ListViewItem listViewItem1 = new ListViewItem(new string[] { "/downloads/" }, 0, Color.Black, Color.Empty, null);
+                        ListViewItem listViewItem2 = new ListViewItem(new string[] { "skindows.html" }, 1, Color.Black, Color.Empty, null);
+                        ftpFiles.Items.AddRange(new ListViewItem[] { listViewItem1, listViewItem2 });
+                    }
+                    else if (objListViewItem.Text == "/downloads/")
+                    {
+                        ftpFiles.Clear();
+                        ListViewItem listViewItem1 = new ListViewItem(new string[] { "/totallynotthetimedistorter/" }, 0, Color.Black, Color.Empty, null);
+                        ListViewItem listViewItem2 = new ListViewItem(new string[] { "FTP Client Setup.exe" }, 2, Color.Black, Color.Empty, null);
+                        ListViewItem listViewItem3 = new ListViewItem(new string[] { "Web Chat Setup.exe" }, 2, Color.Black, Color.Empty, null);
+                        ListViewItem listViewItem4 = new ListViewItem(new string[] { "Guess The Number V1 Setup.exe" }, 2, Color.Black, Color.Empty, null);
+                        ftpFiles.Items.AddRange(new ListViewItem[] { listViewItem1, listViewItem2, listViewItem3, listViewItem4 });
+                    }
+                    else if (objListViewItem.Text == "/totallynotthetimedistorter/")
+                    {
+                        ftpFiles.Clear();
+                        ListViewItem listViewItem1 = new ListViewItem(new string[] { "Time Distorter Setup.exe" }, 2, Color.Black, Color.Empty, null);
+                        ftpFiles.Items.AddRange(new ListViewItem[] { listViewItem1 });
+                    }
+                    else if (objListViewItem.Text == "FTP Client Setup.exe")
+                    {
+                        WinClassicDownloader opendownload = new WinClassicDownloader();
+                        WindowManager wm = new WindowManager();
+                        wm.Init(opendownload, "Downloader", null, false, true);
+                        opendownload.appName.Text = "Downloading: FTP Client";
+                    }
+                    else if (objListViewItem.Text == "Web Chat Setup.exe")
+                    {
+                        WinClassicDownloader opendownload = new WinClassicDownloader();
+                        WindowManager wm = new WindowManager();
+                        wm.Init(opendownload, "Downloader", null, false, true);
+                        opendownload.appName.Text = "Downloading: Web Chat 1998";
+                        opendownload.amountToDL = 35;
+                    }
+                    else if (objListViewItem.Text == "Time Distorter Setup.exe")
+                    {
+                        WinClassicDownloader opendownload = new WinClassicDownloader();
+                        WindowManager wm = new WindowManager();
+                        wm.Init(opendownload, "Downloader", null, false, true);
+                        opendownload.appName.Text = "Downloading: Time Distorter 0.1";
+                    }
+                    else if (objListViewItem.Text == "Guess The Number V1 Setup.exe")
+                    {
+                        WinClassicDownloader opendownload = new WinClassicDownloader();
+                        WindowManager wm = new WindowManager();
+                        wm.Init(opendownload, "Downloader", null, false, true);
+                        opendownload.appName.Text = "Downloading: Guess The Number V1";
+                        opendownload.amountToDL = 16;
+                    }
                 }
-            }
+            } catch { } // Try catch due to if you have more then one item selected the game crashing.
         }
 
         private void btnCancel_Click(object sender, EventArgs e)
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.cs
index 91d9368..381f5ee 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicWordPad.cs
@@ -225,6 +225,7 @@ namespace Histacom2.OS.Win95.Win95Apps
             {
                 ActivateSaveFileDialog(".rtf");
                 string selectedPath = Program.OpenFileExplorerAsDialogAndReturnGivenPath();
+                DeactivateFileDialog();
 
                 if (selectedPath != "")
                 {