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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d9d52bccc
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-05 (Sun, 05 Nov 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2017-11-05 17:00:51 +01:00
parent c3415790b1 a076cad74f
commit 8de2c23aa5
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/simple_display.cpp
View File

@@ -353,7 +353,9 @@ void CLCD::showTime(bool force)
if (force || last_display || (switch_name_time_cnt == 0 && ((hour != t->tm_hour) || (minute != t->tm_min)))) { if (force || last_display || (switch_name_time_cnt == 0 && ((hour != t->tm_hour) || (minute != t->tm_min)))) {
hour = t->tm_hour; hour = t->tm_hour;
minute = t->tm_min; minute = t->tm_min;
#if !HAVE_SPARK_HARDWARE && !HAVE_ARM_HARDWARE
int ret = -1; int ret = -1;
#endif
#if HAVE_SPARK_HARDWARE #if HAVE_SPARK_HARDWARE
now += t->tm_gmtoff; now += t->tm_gmtoff;
int fd = dev_open(); int fd = dev_open();