mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-16 18:03:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

dboxinfo: fix merge error in header text

Browse Source 
Origin commit data
------------------
Commit: a93814f12c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)

Origin message was:
------------------
- dboxinfo: fix merge error in header text
This commit is contained in:
vanhofen
2016-08-26 23:25:19 +02:00
parent ad217fc956
commit d2c7f7ca5a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/dboxinfo.cpp
View File

@@ -355,12 +355,14 @@ void CDBoxInfoWidget::paint()
title += ": "; title += ": ";
title + cpuinfo["machine"]; title + cpuinfo["machine"];
} }
#endif
//NI //NI
#if 0 #if 0
char ss[17]; char ss[17];
sprintf(ss, "%016llx", cs_get_serial()); sprintf(ss, "%016llx", cs_get_serial());
title += ", S/N "; title += ", S/N ";
title += ss; title += ss;
width = max(width, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(title, true) + 50);
#endif #endif
title += ": "; title += ": ";
title += g_info.hw_caps->boxvendor; title += g_info.hw_caps->boxvendor;
@@ -371,8 +373,6 @@ void CDBoxInfoWidget::paint()
title += g_info.hw_caps->boxarch; title += g_info.hw_caps->boxarch;
title += ") - "; title += ") - ";
title += g_info.hw_caps->frontend; title += g_info.hw_caps->frontend;
#endif
width = max(width, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(title, true) + 50);
#endif #endif
x = getScreenStartX(width); x = getScreenStartX(width);