Barely-functioning GL playback with new arrangement.

[dcpomatic.git] / src / lib / scoped_temporary.cc

diff --git a/src/lib/scoped_temporary.cc b/src/lib/scoped_temporary.cc
index 3503808bc210c7a09a37caacf0ca839f246ee4cc..ad4f882a2649ecfadb840e88c66c351dc7b60964 100644 (file)
--- 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-2018 Carl Hetherington <cth@carlh.net>
 
     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;
 }