mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-03 02:41:12 +02:00
Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: b7ceb705a0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -273,6 +273,7 @@ bool CScreenShot::SaveFile()
|
||||
break;
|
||||
default:
|
||||
printf("CScreenShot::SaveFile unsupported format %d, using jpeg\n", format);
|
||||
/* fall through */
|
||||
case FORMAT_JPG:
|
||||
ret = SaveJpg();
|
||||
break;
|
||||
@@ -512,6 +513,7 @@ void CScreenShot::MakeFileName(const t_channel_id channel_id)
|
||||
break;
|
||||
default:
|
||||
printf("CScreenShot::MakeFileName unsupported format %d, using jpeg\n", format);
|
||||
/* fall through */
|
||||
case FORMAT_JPG:
|
||||
strcat(fname, ".jpg");
|
||||
break;
|
||||
|
Reference in New Issue
Block a user