avoid configuration mismatch in screen settings

Origin commit data
------------------
Branch: ni/coolstream
Commit: ad8e6180aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-13 (Fri, 13 Jan 2017)

Origin message was:
------------------
- avoid configuration mismatch in screen settings

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-01-13 08:25:56 +01:00
committed by Michael Liebmann
parent d17ca08f73
commit 5f774f310f

View File

@@ -739,6 +739,12 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.screen_width = frameBuffer->getScreenWidth(true); g_settings.screen_width = frameBuffer->getScreenWidth(true);
g_settings.screen_height = frameBuffer->getScreenHeight(true); g_settings.screen_height = frameBuffer->getScreenHeight(true);
// avoid configuration mismatch
if (g_settings.screen_EndX > g_settings.screen_width)
g_settings.screen_EndX = g_settings.screen_width;
if (g_settings.screen_EndY > g_settings.screen_height)
g_settings.screen_EndY = g_settings.screen_height;
g_settings.bigFonts = configfile.getInt32("bigFonts", 0); g_settings.bigFonts = configfile.getInt32("bigFonts", 0);
g_settings.window_size = configfile.getInt32("window_size", 100); g_settings.window_size = configfile.getInt32("window_size", 100);
g_settings.window_width = configfile.getInt32("window_width", g_settings.window_size); g_settings.window_width = configfile.getInt32("window_width", g_settings.window_size);