build: fixing merge build breaks

PR-URL: #277 Reviewed-By: Kunal Pathak <kunal.pathak@microsoft.com>
nodejs · Jun 5, 2017 · 897ea91 · 897ea91
1 parent 7f1ea0d
commit 897ea91
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/node.cc b/src/node.cc
@@ -4812,7 +4812,7 @@ inline int Start_TTDReplay(Isolate* isolate, void* isolate_context,
   // Start debug agent when argv has --debug
   StartDebug(&env, nullptr, debug_options);
 
-  if (debug_options.inspector_enabled() && !debugger_running)
+  if (debug_options.inspector_enabled() && !v8_platform.InspectorStarted(&env))
     return 12;  // Signal internal error.
 
   {

diff --git a/src/node_debug_options.h b/src/node_debug_options.h
@@ -24,7 +24,7 @@ class DebugOptions {
   int port() const;
   void set_port(int port) { port_ = port; }
 #if ENABLE_TTD_NODE
-  void do_wait_for_connect() { wait_connect_ = true; }
+  void do_wait_for_connect() { break_first_line_ = true; }
 #endif
 
  private: