flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-21 12:55:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Release input devices when application is shutdown

Browse Source 
If they are released with the deallocation of CInputManager, we might
run into global deallocation hell.
Also on Windows release all DirectX devices before COM library is closed.

ref T391
This commit is contained in:
Roland Winklmeier
2018-10-05 13:32:01 +02:00
committed by Klaus Basan
parent 910b536dee
commit c42900f959
5 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackinput/win/joystickwindows.cpp
View File

@@ -165,6 +165,8 @@ namespace BlackInput
CJoystickWindows::~CJoystickWindows()
{
m_joystickDevices.clear();
m_directInput.reset();
CoUninitialize();
}

6
src/blackinput/win/joystickwindows.h
View File

@@ -134,13 +134,13 @@ namespace BlackInput
ATOM helperWindowClass = 0;
HWND helperWindow = nullptr;
const TCHAR *helperWindowClassName = TEXT("HelperWindow");
const TCHAR *helperWindowName = TEXT("JoystickCatcherWindow");
DirectInput8Ptr m_directInput; //!< DirectInput object
QVector<CJoystickDevice *> m_joystickDevices; //!< Joystick devices
BlackMisc::Input::CHotkeyCombination m_buttonCombination;
const TCHAR *helperWindowClassName = TEXT("HelperWindow");
const TCHAR *helperWindowName = TEXT("JoystickCatcherWindow");
};
} // ns