From 72202e8b2f6cb48ea14822642f2740298abafce1 Mon Sep 17 00:00:00 2001
From: Alexey Pegov <alexey.pegov@jetbrains.com>
Date: Wed, 30 Nov 2011 17:55:48 +0400
Subject: [PATCH] EA-29975 - NPE: MacMessagesImpl$5.fun

---
 .../src/com/intellij/ui/mac/MacMessagesImpl.java              | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platform/platform-impl/src/com/intellij/ui/mac/MacMessagesImpl.java b/platform/platform-impl/src/com/intellij/ui/mac/MacMessagesImpl.java
index 3ebf3bad2406..bcf84c6ebb99 100644
--- a/platform/platform-impl/src/com/intellij/ui/mac/MacMessagesImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/mac/MacMessagesImpl.java
@@ -473,6 +473,8 @@ public class MacMessagesImpl extends MacMessages {
 
               cancelCode = 2;
 
+              if (result == null) result = 2;
+              
               switch (result) {
                 case 1:
                   code = 0;
@@ -492,6 +494,8 @@ public class MacMessagesImpl extends MacMessages {
 
               cancelCode = 1;
 
+              if (result == null) result = -1;
+
               switch (result) {
                 case 1:
                   code = 0;