some nver read compil fixes

Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a98ee851e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-26 (Tue, 26 Apr 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2016-04-26 19:39:43 +02:00
parent 00617f957a
commit 34a4758554
2 changed files with 2 additions and 3 deletions

View File

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

View File

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