Merge branch 'master' of ssh://dolda2000.com/srv/git/r/kaka/cakelight

diff --git a/src/kaka/cakelight/CakeLight.java b/src/kaka/cakelight/CakeLight.java
index cd59362..2f77a14 100644 (file)
--- a/src/kaka/cakelight/CakeLight.java
+++ b/src/kaka/cakelight/CakeLight.java
@@ -42,12 +42,10 @@ public class CakeLight {
     }
 
     public Mode popMode() {
-        if (!modes.isEmpty()) {
+        if (modes.size() > 1) {
             Mode mode = modes.pop();
             stopMode(mode);
-            if (!modes.isEmpty()) {
-                resumeMode(modes.peek());
-            }
+            resumeMode(modes.peek());
             return mode;
         }
         return null;