X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmagick_image_proxy.cc;h=d4d7e8aa6b8690a2c8945b5fae5111b3fc4c4b35;hb=661de111c0dbc968ecb004eca5b26f8400b136f1;hp=c9cddd8997fc71ae1d3d4c58f037d4c289b807c0;hpb=77f7f3be256f81d2977bccdb236582e18a625ba7;p=dcpomatic.git

diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index c9cddd899..d4d7e8aa6 100644
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,8 +21,9 @@
 #include "magick_image_proxy.h"
 #include "cross.h"
 #include "exceptions.h"
-#include "util.h"
+#include "dcpomatic_socket.h"
 #include "image.h"
+#include "compose.hpp"
 
 #include "i18n.h"
 
@@ -65,6 +66,8 @@ MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> s
 shared_ptr<Image>
 MagickImageProxy::image (optional<dcp::NoteHandler>) const
 {
+	boost::mutex::scoped_lock lm (_mutex);
+	
 	if (_image) {
 		return _image;
 	}