From 170834839fad3e254e67d2d05a67c15534bb9153 Mon Sep 17 00:00:00 2001
From: fgerlits <fgerlits@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Tue, 28 Nov 2006 19:28:44 +0000
Subject: [PATCH] correction to the previous commit
---
campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx b/campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx
index 734ca9a2b..990deb178 100644
--- a/campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx
+++ b/campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx
@@ -739,9 +739,7 @@ GLiveSupport :: getAudioClip(Ptr<const UniqueId>::Ref id)
AudioClipMap::iterator it = openedAudioClips->find(id->getId());
if (it != openedAudioClips->end()) {
clip = it->second;
- }
-
- if (!clip || !clip->getToken()) {
+ } else {
clip = storage->getAudioClip(sessionId, id);
(*openedAudioClips)[id->getId()] = clip;
}
@@ -764,7 +762,9 @@ GLiveSupport :: acquireAudioClip(Ptr<const UniqueId>::Ref id)
AudioClipMap::iterator it = openedAudioClips->find(id->getId());
if (it != openedAudioClips->end()) {
clip = it->second;
- } else {
+ }
+
+ if (!clip || !clip->getToken()) {
clip = storage->acquireAudioClip(sessionId, id);
(*openedAudioClips)[id->getId()] = clip;
}