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

some nver read compil fixes

Browse Source 
Origin commit data
------------------
Commit: 8a98ee851e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-26 (Tue, 26 Apr 2016)
This commit is contained in:
Jacek Jendrzej
2016-04-26 19:39:43 +02:00
parent c936d09ec4
commit f3f69bb8ce
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/movieplayer.cpp
View File

@@ -576,7 +576,7 @@ bool CMoviePlayerGui::SelectFile()
if (moviebrowser->getSelectedFiles(filelist, milist)) { if (moviebrowser->getSelectedFiles(filelist, milist)) {
filelist_it = filelist.begin(); filelist_it = filelist.begin();
p_movie_info = *(milist.begin()); p_movie_info = *(milist.begin());
file = &(*filelist_it); // file = &(*filelist_it);
} }
else if ((file = moviebrowser->getSelectedFile()) != NULL) { else if ((file = moviebrowser->getSelectedFile()) != NULL) {
p_movie_info = moviebrowser->getCurrentMovieInfo(); p_movie_info = moviebrowser->getCurrentMovieInfo();

3
src/neutrino.cpp
View File

@@ -4727,12 +4727,11 @@ void CNeutrinoApp::migrateConfig(const char *fname)
migconf.loadConfig(fname); migconf.loadConfig(fname);
/* here we do a simple rename of config file keys */ /* here we do a simple rename of config file keys */
int magic = -424242; /* obviously a value that does not appear in real cases */ int magic = -424242; /* obviously a value that does not appear in real cases */
int tmp = magic;
int i; int i;
for (i = 0; key_rename[i].from != NULL; i++) { for (i = 0; key_rename[i].from != NULL; i++) {
const char *from = key_rename[i].from; const char *from = key_rename[i].from;
const char *to = key_rename[i].to; const char *to = key_rename[i].to;
tmp = migconf.getInt32(from, magic); int tmp = migconf.getInt32(from, magic);
if (tmp == magic) /* old key does not exist */ if (tmp == magic) /* old key does not exist */
continue; continue;
/* only set new key to old value if the new key does not yet exist */ /* only set new key to old value if the new key does not yet exist */