From 3080356e8c3d275634cb011a160d47f3a482cfbb Mon Sep 17 00:00:00 2001
From: Nat <natcl@hotmail.com>
Date: Thu, 13 Sep 2007 16:02:35 +0000
Subject: merge fix

---
(limited to 'TamTamJam.activity/Jam')

diff --git a/TamTamJam.activity/Jam/Popup.py b/TamTamJam.activity/Jam/Popup.py
index 3d21e7f..9af550c 100644
--- a/TamTamJam.activity/Jam/Popup.py
+++ b/TamTamJam.activity/Jam/Popup.py
@@ -791,7 +791,7 @@ class Loop( Popup ):
         if self.recording:
             return
 
-        self.owner.setPaused( True )
+        #self.owner.setPaused( True )
         self.owner.pushInstrument( self.instrument )
         self.owner.setKeyboardListener( self )
         
@@ -804,7 +804,7 @@ class Loop( Popup ):
         if not self.recording:
             return
 
-        self.owner.setPaused( False )
+        #self.owner.setPaused( False )
         self.owner.popInstrument()
         self.owner.setKeyboardListener( None )
 
--
cgit v0.9.1