From 67fa71303809a1a4218d9b8e3cc04f662f22953a Mon Sep 17 00:00:00 2001 From: cutealien Date: Sat, 27 Jan 2024 15:57:28 +0000 Subject: [PATCH] Minor code cleanup fixing trivial level 4 warnings git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6589 dfc29bdd-3216-0410-991c-e03cc46cb475 --- source/Irrlicht/CIrrDeviceWin32.cpp | 3 ++- source/Irrlicht/CWGLManager.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/Irrlicht/CIrrDeviceWin32.cpp b/source/Irrlicht/CIrrDeviceWin32.cpp index 88ecc26d..29dcdf91 100644 --- a/source/Irrlicht/CIrrDeviceWin32.cpp +++ b/source/Irrlicht/CIrrDeviceWin32.cpp @@ -435,8 +435,9 @@ irr::core::stringc SJoystickWin32Control::findJoystickName(int index, const JOYC RegCloseKey(hKey); return result; -#endif +#else return ""; +#endif } bool SJoystickWin32Control::activateJoysticks(core::array & joystickInfo) diff --git a/source/Irrlicht/CWGLManager.cpp b/source/Irrlicht/CWGLManager.cpp index 1368c3d7..b7372121 100644 --- a/source/Irrlicht/CWGLManager.cpp +++ b/source/Irrlicht/CWGLManager.cpp @@ -297,7 +297,8 @@ bool CWGLManager::initialize(const SIrrlichtCreationParameters& params, const SE // now get new window CurrentContext.OpenGLWin32.HWnd=videodata.OpenGLWin32.HWnd; // get hdc - if (!(CurrentContext.OpenGLWin32.HDc=GetDC((HWND)videodata.OpenGLWin32.HWnd))) + CurrentContext.OpenGLWin32.HDc=GetDC((HWND)videodata.OpenGLWin32.HWnd); + if (!CurrentContext.OpenGLWin32.HDc) { os::Printer::log("Cannot create a GL device context.", ELL_ERROR); return false;