Simplify dialog result pattern

This commit is contained in:
Kurt
2020-05-21 10:32:16 -07:00
parent db55f48650
commit d848f87bd7
2 changed files with 3 additions and 6 deletions

View File

@@ -1,6 +1,7 @@
using System;
using System.IO;
using System.Linq;
using System.Windows.Forms;
using pkNX.Containers;
using pkNX.Game;
using pkNX.Randomization;
@@ -204,9 +205,7 @@ private void PopWildEdit(string file)
var obj = FlatBufferConverter.DeserializeFrom<EncounterArchive7b>(winner);
using var form = new GGWE(ROM, obj);
form.ShowDialog();
var result = form.Result;
if (string.IsNullOrWhiteSpace(result))
if (form.ShowDialog() != DialogResult.OK)
return;
var data = FlatBufferConverter.SerializeFrom(obj);

View File

@@ -279,8 +279,6 @@ private void SaveEntry(int i)
EL_Sky.SaveCurrent();
}
public string Result { get; set; }
private void B_Save_Click(object sender, EventArgs e)
{
SaveEntry(entry);
@@ -291,7 +289,7 @@ private void B_Save_Click(object sender, EventArgs e)
EL_Super.SaveCurrent();
EL_Sky.SaveCurrent();
Result = "OK";
DialogResult = DialogResult.OK;
Close();
}