提交 f5d80162 编写于 作者: D dav

7042429: jdk 7 b140: crashes in awt.dll+0xb85fb] ...

7042429: jdk 7 b140: crashes in awt.dll+0xb85fb]  Java_sun_awt_Win32GraphicsEnvironment_isVistaOS+0xfdf
Reviewed-by: bae, dcherepanov
上级 085f3bd5
......@@ -191,6 +191,14 @@ void D3DPipelineManager::NotifyAdapterEventListeners(UINT adapter,
pMgr = D3DPipelineManager::GetInstance();
RETURN_IF_NULL(pMgr);
hMon = pMgr->pd3d9->GetAdapterMonitor(adapter);
/*
* If we don't have devices initialized yet, no sense to clear them.
*/
if (!Devices::GetInstance()){
return;
}
gdiScreen = AwtWin32GraphicsDevice::GetScreenFromHMONITOR(hMon);
JNU_CallStaticMethodByName(env, NULL,
......
......@@ -36,6 +36,7 @@ class AwtWin32GraphicsDevice;
class Devices {
public:
static Devices* GetInstance();
static BOOL UpdateInstance(JNIEnv *env);
int GetNumDevices() { return numDevices; }
AwtWin32GraphicsDevice* GetDeviceReference(int index, BOOL adjust = TRUE);
......@@ -59,7 +60,6 @@ friend class InstanceAccess;
private:
Devices(int numElements);
void AddReference();
static Devices* GetInstance();
AwtWin32GraphicsDevice** devices;
int refCount;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册