Ram Watch - various fixes to saving and loading files

This commit is contained in:
adelikat 2013-10-14 00:20:32 +00:00
parent 6b38ab74b5
commit 6f9d912300
2 changed files with 17 additions and 4 deletions

View File

@ -58,6 +58,8 @@ namespace BizHawk.MultiClient
public MemoryDomain Domain { get { return _domain; } }
public string DomainName { get { return _domain != null ? _domain.Name : String.Empty; } }
public virtual int? Address { get { return _address; } }
public virtual string AddressString { get { return _address.ToString(AddressFormatStr); } }

View File

@ -352,11 +352,11 @@ namespace BizHawk.MultiClient
foreach (Watch w in _watchList)
{
sb
.Append(String.Format(AddressFormatStr, w.Address)).Append('\t')
.Append(String.Format(AddressFormatStr, w.Address ?? 0)).Append('\t')
.Append(w.SizeAsChar).Append('\t')
.Append(w.TypeAsChar).Append('\t')
.Append(w.BigEndian ? '1' : '0').Append('\t')
.Append(w.Domain.Name).Append('\t')
.Append(w.DomainName).Append('\t')
.Append(w.Notes)
.AppendLine();
}
@ -364,6 +364,8 @@ namespace BizHawk.MultiClient
sw.WriteLine(sb.ToString());
}
Global.Config.RecentWatches.Add(CurrentFileName);
Changes = false;
return true;
}
@ -383,7 +385,7 @@ namespace BizHawk.MultiClient
private bool LoadFile(string path, bool append)
{
string domain = "";
string domain = String.Empty;
var file = new FileInfo(path);
if (file.Exists == false) return false;
bool isBizHawkWatch = true; //Hack to support .wch files from other emulators
@ -392,7 +394,7 @@ namespace BizHawk.MultiClient
{
string line;
if (append == false)
if (!append)
{
Clear();
}
@ -510,6 +512,15 @@ namespace BizHawk.MultiClient
}
}
if (!append)
{
Global.Config.RecentWatches.Add(path);
Changes = false;
}
else
{
Changes = true;
}
return true;
}