Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TamTamJam.activity/Jam/Desktop.py
diff options
context:
space:
mode:
Diffstat (limited to 'TamTamJam.activity/Jam/Desktop.py')
-rw-r--r--TamTamJam.activity/Jam/Desktop.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/TamTamJam.activity/Jam/Desktop.py b/TamTamJam.activity/Jam/Desktop.py
index 1f5e5eb..67dc70b 100644
--- a/TamTamJam.activity/Jam/Desktop.py
+++ b/TamTamJam.activity/Jam/Desktop.py
@@ -34,7 +34,6 @@ class Desktop( gtk.EventBox ):
self.blocks = [] # items on the desktop
self.activeInstrument = None
- self.activeDrum = None
self.loops = {} # dict of playing loops by loop root
self.drums = [] # list of active drums
@@ -128,11 +127,12 @@ class Desktop( gtk.EventBox ):
break
elif block.type == Block.Drum:
- if block == self.activeDrum:
- self.deactivateDrum()
+ if block.isActive():
+ self.deactivateDrum( block )
elif block.type == Block.Loop:
- pass
+ if block.isActive():
+ self.deactivateLoop( block )
if block in self.blocks:
block.invalidate_rect( True )