1 files changed, 7 insertions, 1 deletions
diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp
index 0879913cb76..ab851a7d2e5 100644
--- a/src/common/Debugging/WheatyExceptionReport.cpp
+++ b/src/common/Debugging/WheatyExceptionReport.cpp
@@ -1326,7 +1326,13 @@ EnumerateSymbolsCallbackContext* pCtx)
         pVariable += *registerValue;
     }
     else if (pSym->Flags & IMAGEHLP_SYMBOL_INFO_REGISTER)
-        return false;                                       // Don't try to report register variable
+    {
+        registerVariableStorage = GetIntegerRegisterValue(pCtx->context, pSym->Register);
+        if (!registerVariableStorage)
+            return false;                                   // Don't try to report non-integer register variable
+
+        pVariable = reinterpret_cast<DWORD_PTR>(&*registerVariableStorage);
+    }
     else
     {
         // It must be a global variable