ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed possible issue with changing resolution

Browse Source
This commit is contained in:
Deve 2017-09-27 22:24:40 +02:00
parent 126991118d
commit de116c7e4c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
View File

@ -277,7 +277,7 @@ bool CIrrDeviceLinux::restoreResolution()
} }
#endif #endif
#ifdef _IRR_LINUX_X11_RANDR_ #ifdef _IRR_LINUX_X11_RANDR_
if (UseXRandR && CreationParams.Fullscreen && old_mode != BadRRMode) if (UseXRandR && CreationParams.Fullscreen && old_mode != 0)
{ {
XRRScreenResources* res = XRRGetScreenResources(display, DefaultRootWindow(display)); XRRScreenResources* res = XRRGetScreenResources(display, DefaultRootWindow(display));
if (!res) if (!res)
@ -385,7 +385,7 @@ bool CIrrDeviceLinux::changeResolution()
#ifdef _IRR_LINUX_X11_RANDR_ #ifdef _IRR_LINUX_X11_RANDR_
while (XRRQueryExtension(display, &eventbase, &errorbase)) while (XRRQueryExtension(display, &eventbase, &errorbase))
{ {
if (output_id == BadRROutput) if (output_id == 0)
break; break;
XRRScreenResources* res = XRRGetScreenResources(display, DefaultRootWindow(display)); XRRScreenResources* res = XRRGetScreenResources(display, DefaultRootWindow(display));
@ -2057,8 +2057,8 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
} }
#endif #endif
#ifdef _IRR_LINUX_X11_RANDR_ #ifdef _IRR_LINUX_X11_RANDR_
output_id = BadRROutput; output_id = 0;
old_mode = BadRRMode; old_mode = 0;
while (XRRQueryExtension(display, &eventbase, &errorbase)) while (XRRQueryExtension(display, &eventbase, &errorbase))
{ {
@ -2089,7 +2089,7 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
} }
if (res->outputs[i] == primary_id || if (res->outputs[i] == primary_id ||
output_id == BadRROutput || crtc_tmp->x < crtc->x || output_id == 0 || crtc_tmp->x < crtc->x ||
(crtc_tmp->x == crtc->x && crtc_tmp->y < crtc->y)) (crtc_tmp->x == crtc->x && crtc_tmp->y < crtc->y))
{ {
XRRFreeCrtcInfo(crtc); XRRFreeCrtcInfo(crtc);
@ -2109,7 +2109,7 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
break; break;
} }
if (output_id == BadRROutput) if (output_id == 0)
{ {
os::Printer::log("Could not get video output.", ELL_WARNING); os::Printer::log("Could not get video output.", ELL_WARNING);
break; break;