Cleanup (one assertion is enough)
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Sat, 8 Nov 2014 15:20:52 +0000 (16:20 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Sat, 8 Nov 2014 15:20:52 +0000 (16:20 +0100)
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java

index 32e823bd9758e7ed115baa00dbc2603a2e558812..c9eb3dfc3ba1ce1ff1131de8eb85517e19e7a38b 100644 (file)
@@ -438,9 +438,9 @@ public final class ActionManagerImpl extends ActionManagerEx implements Applicat
 
   private void _removeTimerListener(TimerListener listener, boolean transparent) {
     if (ApplicationManager.getApplication().isUnitTestMode()) return;
 
   private void _removeTimerListener(TimerListener listener, boolean transparent) {
     if (ApplicationManager.getApplication().isUnitTestMode()) return;
-    LOG.assertTrue(myTimer != null);
-
-    myTimer.removeTimerListener(listener, transparent);
+    if (LOG.assertTrue(myTimer != null)) {
+      myTimer.removeTimerListener(listener, transparent);
+    }
   }
 
   public ActionPopupMenu createActionPopupMenu(String place, @NotNull ActionGroup group, @Nullable PresentationFactory presentationFactory) {
   }
 
   public ActionPopupMenu createActionPopupMenu(String place, @NotNull ActionGroup group, @Nullable PresentationFactory presentationFactory) {