[tor-commits] [arm/master] fix: preventing prompt launch without tor instance

[atagar at torproject.org]

commit 1bdc11a0df6b35530b1dfa5a5c033cbcd88a4845
Author: Damian Johnson <atagar at torproject.org>
Date:   Fri Aug 26 07:54:56 2011 -0700

    fix: preventing prompt launch without tor instance
    
    It doesn't really make sense to allow the control prompt to launch when we're
    unable to connect to tor.
---
 src/starter.py |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/starter.py b/src/starter.py
index 5b86c10..ff2f4a8 100644
--- a/src/starter.py
+++ b/src/starter.py
@@ -386,6 +386,10 @@ if __name__ == '__main__':
     msg = STANDARD_CFG_NOT_FOUND_MSG % configPath
     util.log.log(util.log.NOTICE, msg)
   
+  # when launching a prompt it doens't make sense to be without a tor instance
+  if launchPrompt:
+    config.set("features.allowDetachedStartup", "false")
+  
   # revises defaults to match user's configuration
   config.update(CONFIG)