On "Save As" file name was incorrect or empty.

This commit is contained in:
Alexander 2019-01-07 12:32:23 +02:00
parent b4a1c75ddf
commit 2db0ecf2c7

View file

@ -947,7 +947,6 @@ private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
if (PublicVar.encryptionKey.Get() == null) if (PublicVar.encryptionKey.Get() == null)
{ {
//SaveFile.FileName = "Unnamed.cnp";
SaveAsToolStripMenuItem_Click(this, new EventArgs()); SaveAsToolStripMenuItem_Click(this, new EventArgs());
if (!PublicVar.okPressed) if (!PublicVar.okPressed)
{ {
@ -986,12 +985,13 @@ private void SaveAsToolStripMenuItem_Click(object sender, EventArgs e)
if (filePath != "") if (filePath != "")
{ {
PublicVar.openFileName = Path.GetFileName(filePath); PublicVar.openFileName = Path.GetFileName(filePath);
SaveFile.FileName = Path.GetFileName(filePath);
} }
else else
{ {
PublicVar.openFileName = "Unnamed.cnp"; PublicVar.openFileName = "Unnamed.cnp";
SaveFile.FileName = "Unnamed.cnp";
} }
SaveFile.FileName = Path.GetFileName(filePath);
EnterKeyForm f2 = new EnterKeyForm(); EnterKeyForm f2 = new EnterKeyForm();
if (string.IsNullOrEmpty(PublicVar.encryptionKey.Get())) 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) private void MainVariablesToolStripMenuItem_Click(object sender, EventArgs e)
{ {
#if DEBUG #if DEBUG
var time = DateTime.Now; string formattedTime = DateTime.Now.ToString("yyyy.MM.dd hh:mm:ss");
string formattedTime = time.ToString("yyyy.MM.dd hh:mm:ss");
Debug.WriteLine("\nTime: " + formattedTime); Debug.WriteLine("\nTime: " + formattedTime);
Debug.WriteLine("PublicVar.openFileName: " + PublicVar.openFileName); Debug.WriteLine("PublicVar.openFileName: " + PublicVar.openFileName);
Debug.WriteLine("filePath: " + filePath); Debug.WriteLine("filePath: " + filePath);