empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debugger: Script Window - Fixed endless popups being shown when editing the script in another editor

Browse source
This commit is contained in:
Sour 2018-12-18 16:10:01 -05:00
parent a8a2ce4403
commit 440ca612f2
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
GUI.NET/Debugger/frmScript.cs
View file

@ -224,10 +224,10 @@ namespace Mesen.GUI.Debugger
txtScriptContent.ClearUndo();
}
public void LoadScriptFile(string filepath, bool runScript = true)
public void LoadScriptFile(string filepath, bool runScript = true, bool disableSavePrompt = false)
{
if(File.Exists(filepath)) {
if(!SavePrompt()) {
if(!disableSavePrompt && !SavePrompt()) {
return;
}
string content = File.ReadAllText(filepath);
@ -366,6 +366,7 @@ namespace Mesen.GUI.Debugger
private void tmrLog_Tick(object sender, EventArgs e)
{
tmrLog.Stop();
if(_scriptId >= 0) {
string newLog = InteropEmu.DebugGetScriptLog(_scriptId);
if(txtLog.Text != newLog) {
@ -381,9 +382,18 @@ namespace Mesen.GUI.Debugger
if(_filePath != null && File.Exists(_filePath) && mnuAutoReload.Checked) {
if(_lastTimestamp < File.GetLastWriteTime(_filePath)) {
LoadScriptFile(_filePath);
if(_originalText != txtScriptContent.Text) {
DialogResult result = MessageBox.Show("You have unsaved changes for this script and the file has been modified by another process - would you like to discard the changes and reload the script from the disk?", "Script Window", MessageBoxButtons.YesNo);
if(result == DialogResult.Yes) {
LoadScriptFile(_filePath, true, true);
}
} else {
LoadScriptFile(_filePath, true, true);
}
_lastTimestamp = File.GetLastWriteTime(_filePath);
}
}
tmrLog.Start();
}
private void mnuView_DropDownOpening(object sender, EventArgs e)