FileSystemModel fixes.

Debug assert in x86_64 now generates a SIGTRAP.
Minor JoystickManager fixes.
ecode: Initialize mDisplayDPI before loadConfig().
This commit is contained in:
Martín Lucas Golini
2022-02-04 02:46:23 -03:00
parent da2c522af0
commit 9c14d428e4
9 changed files with 73 additions and 54 deletions

View File

@@ -1985,13 +1985,16 @@ FontTrueType* App::loadFont( const std::string& name, std::string fontPath,
}
void App::init( const std::string& file, const Float& pidelDensity ) {
DisplayManager* displayManager = Engine::instance()->getDisplayManager();
Display* currentDisplay = displayManager->getDisplayIndex( 0 );
mDisplayDPI = currentDisplay->getDPI();
loadConfig();
DisplayManager* displayManager = Engine::instance()->getDisplayManager();
Display* currentDisplay = displayManager->getDisplayIndex(
mConfig.window.displayIndex < displayManager->getDisplayCount()
? mConfig.window.displayIndex
: 0 );
currentDisplay = displayManager->getDisplayIndex( mConfig.window.displayIndex <
displayManager->getDisplayCount()
? mConfig.window.displayIndex
: 0 );
mDisplayDPI = currentDisplay->getDPI();
mResPath = Sys::getProcessPath();