mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-27 15:32:52 +02:00
Merge remote-tracking branch 'check/next-cc'
needs buildfixing in framebuffer class...
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/driver/fontrenderer.cpp
src/driver/volume.cpp
src/gui/audiomute.cpp
src/gui/audioplayer.cpp
src/gui/osd_setup.cpp
src/gui/widget/stringinput.cpp
src/neutrino.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -317,7 +317,7 @@ bool CFileHelpers::copyFile(const char *Src, const char *Dst, mode_t mode)
|
||||
unlink(Dst);
|
||||
if ((fd1 = open(Src, O_RDONLY)) < 0)
|
||||
return false;
|
||||
if ((fd2 = open(Dst, O_WRONLY | O_CREAT)) < 0) {
|
||||
if ((fd2 = open(Dst, O_WRONLY | O_CREAT, 0666)) < 0) {
|
||||
close(fd1);
|
||||
return false;
|
||||
}
|
||||
|
Reference in New Issue
Block a user