Changeset 271

Timestamp:

02/12/06 18:10:04 (3 years ago)

Author:

edmanm

Message:

Even if we change the default Tor arguments, one of them must always still be
-ControlPort? or else we're broken.

Files:

• trunk/src/config/vidaliasettings.cpp (modified) (2 diffs)

trunk/src/config/vidaliasettings.cpp

@@ -58 +58 @@
 #define DEFAULT_OPACITY 100
 
-#define DEFAULT_TOR_ARGUMENTS  "-ControlPort 9051"
+#define DEFAULT_TOR_ARGUMENTS  ""
 #define DEFAULT_CONTROL_ADDR   "127.0.0.1"
 #define DEFAULT_CONTROL_PORT   9051
@@ -142 +142 @@
 VidaliaSettings::getTorArguments()
 {
-  QString args = value(SETTING_TOR_ARGUMENTS,
-                       DEFAULT_TOR_ARGUMENTS).toString();
-  return args.split(";");
+  QStringList args = value(SETTING_TOR_ARGUMENTS,
+                           DEFAULT_TOR_ARGUMENTS).toString().split(";");
+  args << QString("-ControlPort %1").arg(getControlPort());
+  return args;
 }