X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscoped_temporary.cc;h=223100ba5f727df6180eab3b1ba191a38f1ff18b;hb=c162f9d8b127f56b8da46b83908000611033e6a5;hp=3503808bc210c7a09a37caacf0ca839f246ee4cc;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/scoped_temporary.cc b/src/lib/scoped_temporary.cc
index 3503808bc..223100ba5 100644
--- a/src/lib/scoped_temporary.cc
+++ b/src/lib/scoped_temporary.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,17 +18,21 @@
 
 */
 
+
 #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)
 {
 	_file = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path ();
 }
 
+
 /** Close and delete the temporary file */
 ScopedTemporary::~ScopedTemporary ()
 {
@@ -37,29 +41,36 @@ ScopedTemporary::~ScopedTemporary ()
 	boost::filesystem::remove (_file, ec);
 }
 
+
 /** @return temporary filename */
 char const *
 ScopedTemporary::c_str () const
 {
-	return _file.string().c_str ();
+	return _file.string().c_str();
 }
 
+
 /** Open the temporary file.
  *  @return File's FILE pointer.
  */
 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;
 }
 
+
 /** Close the file */
 void
 ScopedTemporary::close ()
 {
 	if (_open) {
 		fclose (_open);
-		_open = 0;
+		_open = nullptr;
 	}
 }