Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(684)

Unified Diff: shell/child_main.cc

Issue 1082973004: Make mojo_shell_child not crash when done. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/child_main.cc
diff --git a/shell/child_main.cc b/shell/child_main.cc
index 4bab35e70d2e4d7c720f5279e69eb73d79f6c32b..6fc14b31a0d8d123b5573ff5be55a1b75d900231 100644
--- a/shell/child_main.cc
+++ b/shell/child_main.cc
@@ -65,7 +65,8 @@ class Blocker {
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); }
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698