From 3db9ea4b505584a6f19502f4271ac9849408c8f9 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Wed, 28 Jan 2009 15:36:33 -0800
Subject: [PATCH] Bug 467371 - VERIFY in nsToolKit::Startup should check
 GetLastError() for ERROR_CLASS_ALREADY_EXISTS. r=dougt

---
 widget/src/windows/nsToolkit.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/widget/src/windows/nsToolkit.cpp b/widget/src/windows/nsToolkit.cpp
index a413611eebfa..a2363791c1e6 100644
--- a/widget/src/windows/nsToolkit.cpp
+++ b/widget/src/windows/nsToolkit.cpp
@@ -261,7 +261,8 @@ nsToolkit::Startup(HMODULE hModule)
     wc.hbrBackground    = NULL;
     wc.lpszMenuName     = NULL;
     wc.lpszClassName    = L"nsToolkitClass";
-    VERIFY(::RegisterClassW(&wc));
+    VERIFY(::RegisterClassW(&wc) || 
+           GetLastError() == ERROR_CLASS_ALREADY_EXISTS);
 
     // Vista API.  Mozilla is DPI Aware.
     typedef BOOL (*SetProcessDPIAwareFunc)(VOID);