Commit 999d5405 authored by hybrid's avatar hybrid

Fix a null driver problem.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@887 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 7b89136c
...@@ -866,10 +866,10 @@ void CIrrDeviceLinux::sleep(u32 timeMs, bool pauseTimer=false) ...@@ -866,10 +866,10 @@ void CIrrDeviceLinux::sleep(u32 timeMs, bool pauseTimer=false)
//! sets the caption of the window //! sets the caption of the window
void CIrrDeviceLinux::setWindowCaption(const wchar_t* text) void CIrrDeviceLinux::setWindowCaption(const wchar_t* text)
{ {
#ifdef _IRR_COMPILE_WITH_X11_
if (DriverType == video::EDT_NULL) if (DriverType == video::EDT_NULL)
return; return;
#ifdef _IRR_COMPILE_WITH_X11_
XTextProperty txt; XTextProperty txt;
XwcTextListToTextProperty(display, const_cast<wchar_t**>(&text), 1, XStdICCTextStyle, &txt); XwcTextListToTextProperty(display, const_cast<wchar_t**>(&text), 1, XStdICCTextStyle, &txt);
XSetWMName(display, window, &txt); XSetWMName(display, window, &txt);
...@@ -1010,6 +1010,9 @@ bool CIrrDeviceLinux::isWindowActive() ...@@ -1010,6 +1010,9 @@ bool CIrrDeviceLinux::isWindowActive()
void CIrrDeviceLinux::setResizeAble(bool resize) void CIrrDeviceLinux::setResizeAble(bool resize)
{ {
#ifdef _IRR_COMPILE_WITH_X11_ #ifdef _IRR_COMPILE_WITH_X11_
if (DriverType == video::EDT_NULL)
return;
XUnmapWindow(display, window); XUnmapWindow(display, window);
if ( !resize ) if ( !resize )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment