From bcbb805744c7f1c13eb9f49c20d1bc167a0b569f Mon Sep 17 00:00:00 2001
From: Cary Sandvig <frang@users.sourceforge.net>
Date: Thu, 3 May 2001 23:09:38 +0000
Subject: [PATCH] adjustment

---
 direct/src/gui/GuiGlobals.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/direct/src/gui/GuiGlobals.py b/direct/src/gui/GuiGlobals.py
index d2c42d7c28..b90c23a50c 100644
--- a/direct/src/gui/GuiGlobals.py
+++ b/direct/src/gui/GuiGlobals.py
@@ -38,21 +38,19 @@ def setDefaultDrawOrder(newDrawOrder):
 
 def getDefaultRolloverSound():
     global sndRollover
+    if not base.wantSfx:
+        return None
     if sndRollover == None:
         sndRollover = base.loadSfx("phase_3/audio/sfx/GUI_rollover.mp3")
-    if base.wantSfx:
-        return sndRollover
-    else:
-        return None
+    return sndRollover
 
 def getDefaultClickSound():
     global sndClick
+    if not base.wantSfx:
+        return None
     if sndClick == None:
         sndClick = base.loadSfx("phase_3/audio/sfx/GUI_create_toon_fwd.mp3")
-    if base.wantSfx:
-        return sndClick
-    else:
-        return None
+    return sndClick
 
 def getNewRolloverFunctor(sound = None):
     val = None