r=dcone@netscape.com
sr=blizzard@mozilla.org
d=In widget/src/gtk/nsWindow.cpp in method GetNativeData when aDataType ==
NS_NATIVE_PLUGIN_PORT we are trying to use content of the mSuperWin without
checking that mSuperWin is not NULL. Adding of this check solves problem. If
mSuperWin is NULL we should return NULL as it happens in case of aDataType ==
NS_NATIVE_WINDOW.
This commit is contained in:
waqar%netscape.com 2000-12-18 21:52:20 +00:00
Родитель 40af7f2ecb
Коммит fb5d52c3d4
1 изменённых файлов: 7 добавлений и 5 удалений

Просмотреть файл

@ -1934,12 +1934,14 @@ void * nsWindow::GetNativeData(PRUint32 aDataType)
if (private_window->destroyed == PR_TRUE) {
return NULL;
}
// we have to flush the X queue here so that any plugins that
// might be running on seperate X connections will be able to use
// this window in case it was just created
XSync(GDK_DISPLAY(), False);
return (void *)GDK_WINDOW_XWINDOW(mSuperWin->bin_window);
}
// we have to flush the X queue here so that any plugins that
// might be running on seperate X connections will be able to use
// this window in case it was just created
XSync(GDK_DISPLAY(), False);
return (void *)GDK_WINDOW_XWINDOW(mSuperWin->bin_window);
return NULL;
}
return nsWidget::GetNativeData(aDataType);