From d2c7f7ca5a1951d0136bade1254bfc1991e562b9 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 26 Aug 2016 23:25:19 +0200 Subject: [PATCH] dboxinfo: fix merge error in header text Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/a93814f12c21905c8ef2438181fe688f6c81bf97 Author: vanhofen Date: 2016-08-26 (Fri, 26 Aug 2016) Origin message was: ------------------ - dboxinfo: fix merge error in header text --- src/gui/dboxinfo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/dboxinfo.cpp b/src/gui/dboxinfo.cpp index 2b5894f68..4acd0b0c7 100644 --- a/src/gui/dboxinfo.cpp +++ b/src/gui/dboxinfo.cpp @@ -355,12 +355,14 @@ void CDBoxInfoWidget::paint() title += ": "; title + cpuinfo["machine"]; } +#endif //NI #if 0 char ss[17]; sprintf(ss, "%016llx", cs_get_serial()); title += ", S/N "; title += ss; + width = max(width, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(title, true) + 50); #endif title += ": "; title += g_info.hw_caps->boxvendor; @@ -371,8 +373,6 @@ void CDBoxInfoWidget::paint() title += g_info.hw_caps->boxarch; title += ") - "; title += g_info.hw_caps->frontend; -#endif - width = max(width, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(title, true) + 50); #endif x = getScreenStartX(width);