# HG changeset patch
# User Chris Cannam
# Date 1237221383 0
# Node ID 2ba202c5be8da2862924f362d3c40512770fda11
# Parent  8688430850d6c1063eb5d5f5cd5fd3d124e9c239
* various minor bits

diff -r 8688430850d6 -r 2ba202c5be8d base/RingBuffer.h
--- a/base/RingBuffer.h	Mon Mar 16 16:32:02 2009 +0000
+++ b/base/RingBuffer.h	Mon Mar 16 16:36:23 2009 +0000
@@ -198,6 +198,7 @@
     std::cerr << "&m_readers = " << &m_readers << std::endl;
     std::cerr << "&m_size = " << &m_size << std::endl;
 */
+    
     for (int i = 0; i < N; ++i) m_readers[i] = 0;
 
     m_scavenger.scavenge();
diff -r 8688430850d6 -r 2ba202c5be8d transform/TransformFactory.cpp
--- a/transform/TransformFactory.cpp	Mon Mar 16 16:32:02 2009 +0000
+++ b/transform/TransformFactory.cpp	Mon Mar 16 16:36:23 2009 +0000
@@ -325,7 +325,9 @@
     TransformDescriptionMap transforms;
 
     populateFeatureExtractionPlugins(transforms);
+    if (m_exiting) return;
     populateRealTimePlugins(transforms);
+    if (m_exiting) return;
 
     // disambiguate plugins with similar names
 
@@ -389,6 +391,7 @@
 {
     std::vector<QString> plugs =
 	FeatureExtractionPluginFactory::getAllPluginIdentifiers();
+    if (m_exiting) return;
 
     for (size_t i = 0; i < plugs.size(); ++i) {
 
@@ -485,6 +488,7 @@
 {
     std::vector<QString> plugs =
 	RealTimePluginFactory::getAllPluginIdentifiers();
+    if (m_exiting) return;
 
     static QRegExp unitRE("[\\[\\(]([A-Za-z0-9/]+)[\\)\\]]$");
 
@@ -617,13 +621,17 @@
 void
 TransformFactory::populateUninstalledTransforms()
 {
+    if (m_exiting) return;
+
     populateTransforms();
+    if (m_exiting) return;
 
     MutexLocker locker(&m_uninstalledTransformsMutex,
                        "TransformFactory::populateUninstalledTransforms");
     if (m_uninstalledTransformsPopulated) return;
 
     PluginRDFIndexer::getInstance()->indexConfiguredURLs();
+    if (m_exiting) return;
 
     //!!! This will be amazingly slow
 
@@ -710,7 +718,7 @@
             m_uninstalledTransforms[tid] = td;
         }
 
-        if (m_exiting) break;
+        if (m_exiting) return;
     }
 
     m_uninstalledTransformsPopulated = true;