Avoid crash when wxGUIAppTraits::GetToolkitInfo is called too
early. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -155,8 +155,11 @@ wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
|
|||||||
// Motif version of the libs but the X protocol
|
// Motif version of the libs but the X protocol
|
||||||
// version!
|
// version!
|
||||||
Display *display = wxGlobalDisplay();
|
Display *display = wxGlobalDisplay();
|
||||||
|
if (display)
|
||||||
|
{
|
||||||
info.versionMajor = ProtocolVersion (display);
|
info.versionMajor = ProtocolVersion (display);
|
||||||
info.versionMinor = ProtocolRevision (display);
|
info.versionMinor = ProtocolRevision (display);
|
||||||
|
}
|
||||||
info.os = wxMOTIF_X;
|
info.os = wxMOTIF_X;
|
||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user