Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-08-23 13:10:49 +02:00
15 changed files with 40 additions and 29 deletions

View File

@@ -836,7 +836,7 @@ void CRadioText::RassDecode(unsigned char *mtext, int len)
slidenumr = Rass_SlideFoto;
}
//
char *filepath;
char *filepath = asprintf(&filepath, "%s/Rass_%d.error", DataDir, slidenumr);
(filetype == 2) ? asprintf(&filepath, "%s/Rass_%d.def", DataDir, slidenumr)
: asprintf(&filepath, "%s/Rass_%d.mpg", DataDir, slidenumr);
if ((fd = fopen(filepath, "wb")) != NULL) {