From 3a02f9ca374a8e85f43a2754e9fd6394899ddaf7 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sat, 18 Jan 2020 00:10:20 +0100 Subject: [PATCH] fix somme inits Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/2d11995d1d00a3097d933a7c047fae87bb8898db Author: Jacek Jendrzej Date: 2020-01-18 (Sat, 18 Jan 2020) --- lib/libtuxtxt/tuxtxt_common.h | 4 ++-- src/driver/rcinput.cpp | 2 +- src/gui/hdd_menu.cpp | 1 + src/gui/moviebrowser/mb.cpp | 4 +++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/libtuxtxt/tuxtxt_common.h b/lib/libtuxtxt/tuxtxt_common.h index c5c8dd07a..0251dd7a4 100644 --- a/lib/libtuxtxt/tuxtxt_common.h +++ b/lib/libtuxtxt/tuxtxt_common.h @@ -593,9 +593,9 @@ void *tuxtxt_CacheThread(void * /*arg*/) tstPageinfo *pageinfo_thread; set_threadname("tuxtxt:cache"); - printf("TuxTxt running thread...(%04x)\n",tuxtxt_cache.vtxtpid); + int err = nice(3); + printf("TuxTxt running thread...(%04x)%s\n",tuxtxt_cache.vtxtpid,err!=0?" nice error":""); tuxtxt_cache.receiving = 1; - nice(3); while (!stop_cache) { /* check stopsignal */ diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 89b622596..8ff3beba6 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -743,7 +743,7 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6 #ifdef KEYBOARD_INSTEAD_OF_REMOTE_CONTROL if (FD_ISSET(fd_keyb, &rfds)) { - uint32_t trkey; + uint32_t trkey = 0; char key = 0; read(fd_keyb, &key, sizeof(key)); diff --git a/src/gui/hdd_menu.cpp b/src/gui/hdd_menu.cpp index 3e7319530..de5d113f3 100644 --- a/src/gui/hdd_menu.cpp +++ b/src/gui/hdd_menu.cpp @@ -752,6 +752,7 @@ bool CHDDMenuHandler::scanDevices() hdd.mounted = false; hdd.fmt = ""; hdd.desc = hdd.devname; + hdd.cmf = NULL; hdd_list.push_back(hdd); } diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index 6e16db323..2b4048d3f 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -609,6 +609,8 @@ void CMovieBrowser::initRows(void) void CMovieBrowser::defaultSettings(MB_SETTINGS* /*settings*/) { MBStorageSettings tmp_store; + tmp_store.storageDirRecUsed = 0; + tmp_store.storageDirMovieUsed = 0; bool keep = false; if (ShowMsg(LOCALE_MOVIEBROWSER_LOAD_DEFAULT, LOCALE_MOVIEBROWSER_MESSAGE_KEEP_STORAGE_SETTINGS, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_QUESTION) == CMsgBox::mbrYes) @@ -3005,7 +3007,7 @@ void CMovieBrowser::loadAllTsFileNamesFromStorage(void) } } - TRACE("[mb] Dir %d, Files: %d, size %u, used_dirs %u\n", (int)m_dirNames.size(), (int)m_vMovieInfo.size(), size, used_dirs); + TRACE("[mb] Dir %d, Files: %d, size %zu, used_dirs %zu\n", (int)m_dirNames.size(), (int)m_vMovieInfo.size(), size, used_dirs); } bool CMovieBrowser::gotMovie(const char *rec_title)