Commit 2ff6cfcc authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

Forward-port fix to make dual-purpose NT executable work.


svn:r3665
parent 55c3f15e
Loading
Loading
Loading
Loading
+4 −2
Changes for src/or/main.c: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1645,11 +1645,14 @@ int tor_main(int argc, char *argv[]) {
    nt_service_main();
    return 0;
  }
#else
#endif
  if (tor_init(argc, argv)<0)
    return -1;
  switch (get_options()->command) {
  case CMD_RUN_TOR:
#ifdef MS_WINDOWS_SERVICE 
    service_status.dwCurrentState = SERVICE_RUNNING;
#endif
    do_main_loop();
    break;
  case CMD_LIST_FINGERPRINT:
@@ -1664,6 +1667,5 @@ int tor_main(int argc, char *argv[]) {
  }
  tor_cleanup();
  return -1;
#endif
}