src/windows/native/sun/windows/awt_Toolkit.cpp

*** 532,542 ****
      // before AwtObjectList::Cleanup() as the d3d will attempt to
      // shutdown when the last of its windows is disposed of
      D3DInitializer::GetInstance().Clean();
  
      AwtObjectList::Cleanup();
-     AwtFont::Cleanup();
  
      awt_dnd_uninitialize();
      awt_clipboard_uninitialize((JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2));
  
      if (tk.m_inputMethodHWnd != NULL) {
--- 532,541 ----
*** 552,561 ****
--- 551,562 ----
      while (::GetMessage(&msg, NULL, 0, 0)) {
          ::TranslateMessage(&msg);
          ::DispatchMessage(&msg);
      }
  
+     AwtFont::Cleanup();
+ 
      HWND toolkitHWndToDestroy = tk.m_toolkitHWnd;
      tk.m_toolkitHWnd = 0;
      VERIFY(::DestroyWindow(toolkitHWndToDestroy) != NULL);
  
      tk.UnregisterClass();