From ee860fd820678ad37f97118069747e8f78b3c903 Mon Sep 17 00:00:00 2001 From: Hathor86 Date: Mon, 30 Nov 2015 18:27:55 +0100 Subject: [PATCH] Quick fix of save watch Wrong ToString() method was called when writing Reading was ok --- BizHawk.Client.Common/tools/Watch/ByteWatch.cs | 6 +++--- BizHawk.Client.Common/tools/Watch/DwordWatch.cs | 4 ++-- BizHawk.Client.Common/tools/Watch/Watch.cs | 2 +- BizHawk.Client.Common/tools/Watch/WordWatch.cs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BizHawk.Client.Common/tools/Watch/ByteWatch.cs b/BizHawk.Client.Common/tools/Watch/ByteWatch.cs index 5e79fafb0b..4510823f33 100644 --- a/BizHawk.Client.Common/tools/Watch/ByteWatch.cs +++ b/BizHawk.Client.Common/tools/Watch/ByteWatch.cs @@ -132,10 +132,10 @@ namespace BizHawk.Client.Common #endregion - public override string ToString() - { + /*public override string ToString() + { return Notes + ": " + ValueString; - } + }*/ #region Properties diff --git a/BizHawk.Client.Common/tools/Watch/DwordWatch.cs b/BizHawk.Client.Common/tools/Watch/DwordWatch.cs index 6a5b39f51e..3c556046c8 100644 --- a/BizHawk.Client.Common/tools/Watch/DwordWatch.cs +++ b/BizHawk.Client.Common/tools/Watch/DwordWatch.cs @@ -97,10 +97,10 @@ namespace BizHawk.Client.Common get { return FormatValue(GetDWord()); } } - public override string ToString() + /*public override string ToString() { return Notes + ": " + ValueString; - } + }*/ public string FormatValue(uint val) { diff --git a/BizHawk.Client.Common/tools/Watch/Watch.cs b/BizHawk.Client.Common/tools/Watch/Watch.cs index 37f838a3a2..252bdc1e60 100644 --- a/BizHawk.Client.Common/tools/Watch/Watch.cs +++ b/BizHawk.Client.Common/tools/Watch/Watch.cs @@ -542,7 +542,7 @@ namespace BizHawk.Client.Common , (Address ?? 0).ToHexString((Domain.Size - 1).NumHexDigits()) , SizeAsChar , TypeAsChar - , BigEndian + , Convert.ToInt32(BigEndian) , DomainName , Notes.Trim('\r', '\n') ); diff --git a/BizHawk.Client.Common/tools/Watch/WordWatch.cs b/BizHawk.Client.Common/tools/Watch/WordWatch.cs index 608392f434..9f0c575a2e 100644 --- a/BizHawk.Client.Common/tools/Watch/WordWatch.cs +++ b/BizHawk.Client.Common/tools/Watch/WordWatch.cs @@ -92,10 +92,10 @@ namespace BizHawk.Client.Common get { return FormatValue(GetWord()); } } - public override string ToString() + /*public override string ToString() { return Notes + ": " + ValueString; - } + }*/ public string FormatValue(ushort val) {