X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscoped_temporary.cc;h=ad4f882a2649ecfadb840e88c66c351dc7b60964;hb=886c256f532e0f43bcd7f6f9924147c151293cab;hp=3503808bc210c7a09a37caacf0ca839f246ee4cc;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/lib/scoped_temporary.cc b/src/lib/scoped_temporary.cc index 3503808bc..ad4f882a2 100644 --- a/src/lib/scoped_temporary.cc +++ b/src/lib/scoped_temporary.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -19,9 +19,11 @@ */ #include "scoped_temporary.h" +#include "exceptions.h" +#include "cross.h" /** Construct a ScopedTemporary. A temporary filename is decided but the file is not opened - * until ::open() is called. + * until open() is called. */ ScopedTemporary::ScopedTemporary () : _open (0) @@ -50,7 +52,11 @@ ScopedTemporary::c_str () const FILE* ScopedTemporary::open (char const * params) { - _open = fopen (c_str(), params); + close (); + _open = fopen_boost (_file, params); + if (!_open) { + throw FileError ("Could not open scoped temporary", _file); + } return _open; }