mirror of
https://github.com/SpartanJ/eepp.git
synced 2026-08-18 06:55:48 +03:00
FileSystemModel fixes.
Debug assert in x86_64 now generates a SIGTRAP. Minor JoystickManager fixes. ecode: Initialize mDisplayDPI before loadConfig().
This commit is contained in:
@@ -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();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user