From 4b3c5dd929ea78ca3b6f656a63d70b10d2f43885 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Nov 2011 17:42:48 -0600
Subject: Fix FTBFS

---
 src/sound/MappedStudio.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/sound/MappedStudio.cpp')

diff --git a/src/sound/MappedStudio.cpp b/src/sound/MappedStudio.cpp
index 1bb6cec..e5a583c 100644
--- a/src/sound/MappedStudio.cpp
+++ b/src/sound/MappedStudio.cpp
@@ -1410,7 +1410,7 @@ MappedPluginSlot::setProperty(const MappedObjectProperty &property,
                 // populate myself and my ports
                 PluginFactory *factory = PluginFactory::instanceFor(m_identifier);
                 if (!factory) {
-                    std::cerr << "WARNING: MappedPluginSlot::setProperty(identifier): No plugin factory for identifier " << m_identifier << "!" << std::endl;
+                    std::cerr << "WARNING: MappedPluginSlot::setProperty(identifier): No plugin factory for identifier " << m_identifier.ascii() << "!" << std::endl;
                     m_identifier = "";
                     return ;
                 }
@@ -1489,7 +1489,7 @@ MappedPluginSlot::setPropertyList(const MappedObjectProperty &property,
                     studio->getSoundDriver()->configurePlugin(m_instrument,
                             m_position,
                             key, value);
-                if (rv && rv != "") {
+                if (!rv.isNull() && rv != "") {
                     throw(rv);
                 }
             }
-- 
cgit v1.2.1