From bc099cfd088065224b4151643f4165e895b9ffcc Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 9 Feb 2017 20:58:44 +0100 Subject: [PATCH] neutrino: fix build Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/eef7c4c867a94b12ad174b2631dddddc5256939e Author: vanhofen Date: 2017-02-09 (Thu, 09 Feb 2017) Origin message was: ------------------ - neutrino: fix build --- src/gui/ni_menu.cpp | 8 ++++---- src/neutrino.cpp | 9 --------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/gui/ni_menu.cpp b/src/gui/ni_menu.cpp index bcb46ae62..ba9b24169 100644 --- a/src/gui/ni_menu.cpp +++ b/src/gui/ni_menu.cpp @@ -234,8 +234,8 @@ bool CNITouchFileNotifier::changeNotify(const neutrino_locale_t, void * data) g_settings.screen_height = 576; g_settings.screen_width = 720; - g_settings.screen_xres = 100; - g_settings.screen_yres = 100; + g_settings.font_scaling_x = 100; + g_settings.font_scaling_y = 100; } else if (strstr(filename, "mgcamd") || strstr(filename, "newcs") || @@ -290,8 +290,8 @@ bool CNITouchFileNotifier::changeNotify(const neutrino_locale_t, void * data) g_settings.screen_height = 720; g_settings.screen_width = 1280; - g_settings.screen_xres = 112; - g_settings.screen_yres = 112; + g_settings.font_scaling_x = 105; + g_settings.font_scaling_y = 105; } else if (strstr(filename, "mgcamd") || strstr(filename, "newcs") || diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 1f324f57c..f141f2cba 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1018,15 +1018,6 @@ void CNeutrinoApp::upgradeSetup(const char * fname) } } //NI - if (g_settings.version_pseudo < "20160623110000") - { - if (g_settings.screen_xres == 112) - g_settings.screen_xres = 105; - - if (g_settings.screen_yres == 112) - g_settings.screen_yres = 105; - } - //NI if (g_settings.version_pseudo < "20160804110000") { if (g_settings.tmdb_api_key == "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")