Fixed changes AShifter accidentaly made

Merge conflicts...

1 files changed, 28 insertions, 4 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs
index e08e6ec..6dd6ee8 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs
@@ -88,14 +88,38 @@ namespace TimeHACK.OS.Win95.Win95Apps
 
         private void openToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            ActivateOpenFileDialog(".txt");
-            mainText.Text = ReadTextFile(Program.OpenFileExplorerAsDialogAndReturnGivenPath());
+            try
+            {
+                ActivateSaveFileDialog(".txt");
+                String selectedPath;
+                selectedPath = Program.OpenFileExplorerAsDialogAndReturnGivenPath();
+
+                MessageBox.Show(selectedPath);
+                if (selectedPath != "")
+                {
+                    mainText.Text = ReadTextFile(selectedPath);
+                }
+            }
+            catch
+            {
+            }
         }
 
         private void saveToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            ActivateSaveFileDialog(".txt");
-            File.WriteAllText(Program.OpenFileExplorerAsDialogAndReturnGivenPath(), mainText.Text);
+            try
+            {
+                ActivateSaveFileDialog(".txt");
+                String selectedPath;
+                selectedPath = Program.OpenFileExplorerAsDialogAndReturnGivenPath();
+
+                MessageBox.Show(selectedPath);
+                if (selectedPath != "")
+                {
+                    File.WriteAllText(selectedPath, mainText.Text);
+                }
+            } catch {
+            }               
         }
     }
 }