Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-09-14 13:54:04 +02:00
61 changed files with 50439 additions and 713 deletions

View File

@@ -128,8 +128,8 @@ void CRCLock::lockRC()
if (lockIcon == NULL)
{
lockIcon = new CComponentsPicture(
g_settings.screen_StartX + 10,
g_settings.screen_StartY + 10,
g_settings.screen_StartX + OFFSET_INNER_MID,
g_settings.screen_StartY + OFFSET_INNER_MID,
NEUTRINO_ICON_RCLOCK);
lockIcon->doPaintBg(false);
}