From 7cce003baa38659fd8a2ba2eac3bebd80a3b860d Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Tue, 9 Sep 2008 19:11:32 +0000
Subject: [PATCH]

---
 build/win32/platform_specific_code/juce_win32_Windowing.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/win32/platform_specific_code/juce_win32_Windowing.cpp b/build/win32/platform_specific_code/juce_win32_Windowing.cpp
index 0dad5eb16a..74f38c73d5 100644
--- a/build/win32/platform_specific_code/juce_win32_Windowing.cpp
+++ b/build/win32/platform_specific_code/juce_win32_Windowing.cpp
@@ -3801,7 +3801,8 @@ public:
 
     static bool doesWindowMatch (const ActiveXControlComponent* const ax, HWND hwnd)
     {
-        return ((ActiveXControlData*) ax->control)->controlHWND == hwnd;
+        return ((ActiveXControlData*) ax->control) != 0
+				&& ((ActiveXControlData*) ax->control)->controlHWND == hwnd;
     }
 };