From 2db0ecf2c7e03aad48c9eeb68587e4ac674f8cd7 Mon Sep 17 00:00:00 2001 From: Alexander Date: Mon, 7 Jan 2019 12:32:23 +0200 Subject: [PATCH] On "Save As" file name was incorrect or empty. --- Crypto Notepad/MainForm.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Crypto Notepad/MainForm.cs b/Crypto Notepad/MainForm.cs index 5c97af7..3496074 100644 --- a/Crypto Notepad/MainForm.cs +++ b/Crypto Notepad/MainForm.cs @@ -947,7 +947,6 @@ private void SaveToolStripMenuItem_Click(object sender, EventArgs e) if (PublicVar.encryptionKey.Get() == null) { - //SaveFile.FileName = "Unnamed.cnp"; SaveAsToolStripMenuItem_Click(this, new EventArgs()); if (!PublicVar.okPressed) { @@ -986,12 +985,13 @@ private void SaveAsToolStripMenuItem_Click(object sender, EventArgs e) if (filePath != "") { PublicVar.openFileName = Path.GetFileName(filePath); + SaveFile.FileName = Path.GetFileName(filePath); } else { PublicVar.openFileName = "Unnamed.cnp"; + SaveFile.FileName = "Unnamed.cnp"; } - SaveFile.FileName = Path.GetFileName(filePath); EnterKeyForm f2 = new EnterKeyForm(); if (string.IsNullOrEmpty(PublicVar.encryptionKey.Get())) @@ -1465,9 +1465,7 @@ private void ChkMatchWholeWord_CheckedChanged(object sender, EventArgs e) private void MainVariablesToolStripMenuItem_Click(object sender, EventArgs e) { #if DEBUG - var time = DateTime.Now; - string formattedTime = time.ToString("yyyy.MM.dd hh:mm:ss"); - + string formattedTime = DateTime.Now.ToString("yyyy.MM.dd hh:mm:ss"); Debug.WriteLine("\nTime: " + formattedTime); Debug.WriteLine("PublicVar.openFileName: " + PublicVar.openFileName); Debug.WriteLine("filePath: " + filePath);