X-Git-Url: https://git.decadent.org.uk/gitweb/?p=memories.git;a=blobdiff_plain;f=Memories%2FPhoto.pm;fp=Memories%2FPhoto.pm;h=691a71415fe3dc210aad283cacc68ee733de6d0d;hp=4945dd8fc719510f045da426022b9692882dc649;hb=1ea2bc20e4db4c0fd7ac23ca6bae5247eeb1dc1a;hpb=d6ac351d3aa425d6701da07e736aa2490b09468b

diff --git a/Memories/Photo.pm b/Memories/Photo.pm
index 4945dd8..691a714 100644
--- a/Memories/Photo.pm
+++ b/Memories/Photo.pm
@@ -124,13 +124,13 @@ sub upload_raw {
     my ($self, $r, $filename, $offered_name) = @_;
     my $jpg = tmpnam().".jpg";
     system("dcraw -c $filename | convert - $jpg");
-    my $photo = $self->upload_jpeg($r, $jpg, $offered_name);
     $filename =~ /\.(.*)$/;
     my $format = $1;
-    $photo->format($format);
     # Put the file in place
+    $photo->format($format);
     copy($filename, 
          Memories->config->{data_store}."/".$photo->id.".".$format);
+    my $photo = $self->upload_jpeg($r, $jpg, $offered_name);
     return $photo;
 }