diff options
| author | David Karlaš <david.karlas@xamarin.com> | 2014-09-30 13:05:45 +0400 |
|---|---|---|
| committer | David Karlaš <david.karlas@xamarin.com> | 2014-09-30 13:05:45 +0400 |
| commit | d14aa5f366e2fd180710b5c4111c8b530389a7ad (patch) | |
| tree | 5dcf1e1b84df7c36112da7d027de3d5b98c999a0 /main/src/addins/MonoDevelop.Debugger.Win32 | |
| parent | 3e5b076dcc1a8b818858f6dcdff43de132bc64a5 (diff) | |
| parent | a8c526c07a49ed07416752c5c05a751e43f4c998 (diff) | |
Merge branch 'master' into debuggerVisualizers
Conflicts:
main/external/debugger-libs
Diffstat (limited to 'main/src/addins/MonoDevelop.Debugger.Win32')
| -rw-r--r-- | main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorObjectAdaptor.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorObjectAdaptor.cs b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorObjectAdaptor.cs index b0bffd5045..1c820963d7 100644 --- a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorObjectAdaptor.cs +++ b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorObjectAdaptor.cs @@ -64,6 +64,8 @@ namespace MonoDevelop.Debugger.Win32 public override bool IsEnum (EvaluationContext ctx, object val)
{
+ if (!(val is CorValRef))
+ return false;
CorType type = (CorType) GetValueType (ctx, val);
return IsEnum (ctx, type);
}
|