ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New Ram Watch - fix some null reference exceptions

This commit is contained in:
adelikat 2013-09-11 22:43:14 +00:00
parent 2e292ca2ee
commit 578efed6bf
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
View File

@ -659,6 +659,12 @@
<Compile Include="tools\VirtualPads\VirtualPadSNESControl.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\Watch\NewRamPoke.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="tools\Watch\NewRamPoke.Designer.cs">
<DependentUpon>NewRamPoke.cs</DependentUpon>
</Compile>
<Compile Include="tools\Watch\NewRamWatch.cs">
<SubType>Form</SubType>
</Compile>
@ -873,6 +879,9 @@
<EmbeddedResource Include="tools\VirtualPads\VirtualPadSaturnControl.resx">
<DependentUpon>VirtualPadSaturnControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\Watch\NewRamPoke.resx">
<DependentUpon>NewRamPoke.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\Watch\NewRamWatch.resx">
<DependentUpon>NewRamWatch.cs</DependentUpon>
</EmbeddedResource>

2
BizHawk.MultiClient/tools/Watch/NewRamWatch.cs
View File

@ -34,7 +34,7 @@ namespace BizHawk.MultiClient
private int defaultWidth;
private int defaultHeight;
private WatchList Watches = new WatchList();
private WatchList Watches = new WatchList(Global.Emulator.MainMemory);
private string systemID = "NULL";
private string _sortedColumn = "";
private bool _sortReverse = false;

5
BizHawk.MultiClient/tools/Watch/Watch.cs
View File

@ -705,7 +705,10 @@ namespace BizHawk.MultiClient
private List<Watch> _watchList = new List<Watch>();
private MemoryDomain _domain = null;
public WatchList() { }
public WatchList(MemoryDomain domain)
{
_domain = domain;
}
public IEnumerator<Watch> GetEnumerator()
{