# HG changeset patch
# User Chris Cannam
# Date 1305635595 -3600
# Node ID db0c86c4e5e9b134f4a71d39e5b27d39f6732a39
# Parent  ee927c1b7941df580e6bb18febfcec464f80eacb# Parent  5f22e0bbe4ba254dfb2d2c262d0539b174694457
Merge from the default branch

diff -r ee927c1b7941 -r db0c86c4e5e9 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Wed May 11 14:41:27 2011 +0100
+++ b/main/MainWindow.cpp	Tue May 17 13:33:15 2011 +0100
@@ -2416,7 +2416,8 @@
 
 		WavFileWriter subwriter(subpath,
                                         model->getSampleRate(),
-                                        model->getChannelCount());
+                                        model->getChannelCount(),
+                                        WavFileWriter::WriteToTemporary);
                 subwriter.writeModel(model, &subms);
 		ok = subwriter.isOK();
 
@@ -2431,7 +2432,8 @@
     if (!multiple) {
         WavFileWriter writer(path,
                              model->getSampleRate(),
-                             model->getChannelCount());
+                             model->getChannelCount(),
+                             WavFileWriter::WriteToTemporary);
         writer.writeModel(model, selectionToWrite);
 	ok = writer.isOK();
 	error = writer.getError();
diff -r ee927c1b7941 -r db0c86c4e5e9 main/OSCHandler.cpp
--- a/main/OSCHandler.cpp	Wed May 11 14:41:27 2011 +0100
+++ b/main/OSCHandler.cpp	Tue May 17 13:33:15 2011 +0100
@@ -106,7 +106,8 @@
                 } else {
                     WavFileWriter writer(path,
                                          getMainModel()->getSampleRate(),
-                                         getMainModel()->getChannelCount());
+                                         getMainModel()->getChannelCount(),
+                                         WavFileWriter::WriteToTemporary);
                     MultiSelection ms = m_viewManager->getSelection();
                     if (!ms.getSelections().empty()) {
                         writer.writeModel(getMainModel(), &ms);