Browse Source

fix crash with vfs-mount at startup

David Rose 16 years ago
parent
commit
35bf03caf1

+ 0 - 8
panda/src/express/config_express.cxx

@@ -59,14 +59,6 @@ ConfigVariableBool keep_temporary_files
           "default) to delete these.  Mainly useful for debugging "
           "when the process goes wrong."));
 
-ConfigVariableInt multifile_encryption_iteration_count
-("multifile-encryption-iteration-count", 0,
- PRC_DESC("This is a special value of encryption-iteration-count used to encrypt "
-          "subfiles within a multifile.  It has a default value of 0 (just one "
-          "application), on the assumption that the files from a multifile must "
-          "be loaded quickly, without paying the cost of an expensive hash on "
-          "each subfile in order to decrypt it."));
-
 ConfigVariableBool collect_tcp
 ("collect-tcp", false,
  PRC_DESC("Set this true to enable accumulation of several small consecutive "

+ 0 - 2
panda/src/express/config_express.h

@@ -48,8 +48,6 @@ extern ConfigVariableInt patchfile_zone_size;
 
 extern ConfigVariableBool keep_temporary_files;
 
-extern ConfigVariableInt multifile_encryption_iteration_count;
-
 extern EXPCL_PANDAEXPRESS ConfigVariableBool collect_tcp;
 extern EXPCL_PANDAEXPRESS ConfigVariableDouble collect_tcp_interval;
 

+ 8 - 0
panda/src/express/multifile.cxx

@@ -103,6 +103,14 @@ Multifile() :
   _read_filew(_read_file),
   _read_write_filew(_read_write_file)
 {
+  ConfigVariableInt multifile_encryption_iteration_count
+    ("multifile-encryption-iteration-count", 0,
+     PRC_DESC("This is a special value of encryption-iteration-count used to encrypt "
+              "subfiles within a multifile.  It has a default value of 0 (just one "
+              "application), on the assumption that the files from a multifile must "
+          "be loaded quickly, without paying the cost of an expensive hash on "
+              "each subfile in order to decrypt it."));
+  
   _read = (IStreamWrapper *)NULL;
   _write = (ostream *)NULL;
   _owns_stream = false;