commit | 2629298328ef3bd6f78e0c52bde1670502b48381 | [log] [tgz] |
---|---|---|
author | Viet-Trung Luu <viettrungluu@chromium.org> | Tue Apr 14 18:06:55 2015 -0700 |
committer | Viet-Trung Luu <viettrungluu@chromium.org> | Tue Apr 14 18:06:55 2015 -0700 |
tree | b3fab7c1b8acba4a3edbc7629787d975c3de557d | |
parent | 2b44d8c1bd8976733e7f1942d7619087e7c837f1 [diff] [blame] |
Make mojo_shell_child not crash when done. BUG=Fixes #96 R=qsr@chromium.org Review URL: https://codereview.chromium.org/1082973004
diff --git a/shell/child_main.cc b/shell/child_main.cc index 4bab35e..6fc14b3 100644 --- a/shell/child_main.cc +++ b/shell/child_main.cc
@@ -65,7 +65,8 @@ void Block() { DCHECK(run_after_.is_null()); event_.Wait(); - run_after_.Run(); + if (!run_after_.is_null()) + run_after_.Run(); } Unblocker GetUnblocker() { return Unblocker(this); }