From 785f9b1d32d365d6882b093551d403a608a2fe93 Mon Sep 17 00:00:00 2001
From: Idris Raja <idris.raja@gmail.com>
Date: Sun, 11 Oct 2015 13:38:14 -0500
Subject: [PATCH] Use base10 value for ivarOffset to be consistent with other
 values used in calculating memory address of watchpoint

---
 commands/FBDebugCommands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commands/FBDebugCommands.py b/commands/FBDebugCommands.py
index 1427e99..eb21f8e 100644
--- a/commands/FBDebugCommands.py
+++ b/commands/FBDebugCommands.py
@@ -32,7 +32,7 @@ def run(self, arguments, options):
     objectAddress = int(fb.evaluateObjectExpression(commandForObject), 0)
 
     ivarOffsetCommand = '(ptrdiff_t)ivar_getOffset((void*)object_getInstanceVariable((id){}, "{}", 0))'.format(objectAddress, ivarName)
-    ivarOffset = fb.evaluateIntegerExpression(ivarOffsetCommand)
+    ivarOffset = int(fb.evaluateExpression(ivarOffsetCommand), 0)
 
     # A multi-statement command allows for variables scoped to the command, not permanent in the session like $variables.
     ivarSizeCommand = ('unsigned int size = 0;'