From 07b5039c64007d470e68981472b926211db3c0b4 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 20 Sep 2013 21:39:07 +0800
Subject: [PATCH] Make sure all sync messages get a return value.

---
 browser/atom/rpc-server.coffee | 2 ++
 renderer/api/lib/remote.coffee | 1 +
 2 files changed, 3 insertions(+)

diff --git a/browser/atom/rpc-server.coffee b/browser/atom/rpc-server.coffee
index 30e9dbd5f0c..0e5c707c403 100644
--- a/browser/atom/rpc-server.coffee
+++ b/browser/atom/rpc-server.coffee
@@ -75,6 +75,7 @@ ipc.on 'ATOM_BROWSER_GLOBAL', (event, processId, routingId, name) ->
 
 ipc.on 'ATOM_BROWSER_RELEASE_RENDER_VIEW', (event, processId, routingId) ->
   objectsRegistry.clear processId, routingId
+  event.returnValue = null
 
 ipc.on 'ATOM_BROWSER_CURRENT_WINDOW', (event, processId, routingId) ->
   try
@@ -127,6 +128,7 @@ ipc.on 'ATOM_BROWSER_MEMBER_SET', (event, processId, routingId, id, name, value)
   try
     obj = objectsRegistry.get id
     obj[name] = value
+    event.returnValue = null
   catch e
     event.returnValue = errorToMeta e
 
diff --git a/renderer/api/lib/remote.coffee b/renderer/api/lib/remote.coffee
index d839a9899a9..7eaafc20aa5 100644
--- a/renderer/api/lib/remote.coffee
+++ b/renderer/api/lib/remote.coffee
@@ -72,6 +72,7 @@ metaToValue = (meta) ->
             ret.__defineSetter__ member.name, (value) ->
               # Set member data.
               ipc.sendChannelSync 'ATOM_BROWSER_MEMBER_SET', meta.id, member.name, value
+              value
 
             ret.__defineGetter__ member.name, ->
               # Get member data.