# HG changeset patch
# User Chris Cannam
# Date 1402663877 -3600
# Node ID 5302c548adadd5e3ddb5fd2eafa45ce3033183e7
# Parent  b38268e34c097c99d19d7430c83d2f6f54b1f44e# Parent  88bf6cc732754841ce451c75c3b3581ac8289e5d
Merge

diff -r 88bf6cc73275 -r 5302c548adad framework/SVFileReader.cpp
--- a/framework/SVFileReader.cpp	Fri Jun 13 12:56:31 2014 +0100
+++ b/framework/SVFileReader.cpp	Fri Jun 13 13:51:17 2014 +0100
@@ -448,7 +448,7 @@
     READ_MANDATORY(int, sampleRate, toInt);
 
     QString type = attributes.value("type").trimmed();
-    bool mainModel = (attributes.value("mainModel").trimmed() == "true");
+    bool isMainModel = (attributes.value("mainModel").trimmed() == "true");
 
     if (type == "wavefile") {
 	
@@ -473,11 +473,12 @@
 
             file.waitForData();
 
-            size_t rate = 0;
+            size_t rate = sampleRate;
 
             if (Preferences::getInstance()->getFixedSampleRate() != 0) {
                 rate = Preferences::getInstance()->getFixedSampleRate();
-            } else if (!mainModel &&
+            } else if (rate == 0 &&
+                       !isMainModel &&
                        Preferences::getInstance()->getResampleOnLoad()) {
                 WaveFileModel *mm = m_document->getMainModel();
                 if (mm) rate = mm->getSampleRate();
@@ -494,7 +495,7 @@
 
         model->setObjectName(name);
 	m_models[id] = model;
-	if (mainModel) {
+	if (isMainModel) {
 	    m_document->setMainModel(model);
 	    m_addedModels.insert(model);
 	}