From b4a3dd35b07d368881d88f1860a42da47a3cad27 Mon Sep 17 00:00:00 2001
From: jsteube <jens.steube@gmail.com>
Date: Thu, 22 Sep 2016 14:59:48 +0200
Subject: [PATCH] Get rid of outfile_check_timer variable in data. context

---
 include/types.h     | 1 -
 src/hashcat.c       | 3 ---
 src/outfile_check.c | 9 +++++----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/include/types.h b/include/types.h
index 7405b1b20..0f2b52986 100644
--- a/include/types.h
+++ b/include/types.h
@@ -969,7 +969,6 @@ typedef struct
 
   u32     attack_mode;
   u32     attack_kern;
-  u32     outfile_check_timer;
   u32     machine_readable;
   u32     quiet;
   u32     force;
diff --git a/src/hashcat.c b/src/hashcat.c
index ce58cb0da..79f9b03cc 100644
--- a/src/hashcat.c
+++ b/src/hashcat.c
@@ -278,7 +278,6 @@ int main (int argc, char **argv)
     data.hex_wordlist = user_options->hex_wordlist;
     data.logfile_disable = user_options->logfile_disable;
     data.machine_readable = user_options->machine_readable;
-    data.outfile_check_timer = user_options->outfile_check_timer;
     data.powertune_enable = user_options->powertune_enable;
     data.quiet = user_options->quiet;
     data.runtime = user_options->runtime;
@@ -2650,8 +2649,6 @@ int main (int argc, char **argv)
       }
     }
 
-    data.outfile_check_timer = user_options->outfile_check_timer;
-
     /**
      * main loop
      */
diff --git a/src/outfile_check.c b/src/outfile_check.c
index 1ab30c8e6..ec562cd08 100644
--- a/src/outfile_check.c
+++ b/src/outfile_check.c
@@ -38,9 +38,10 @@ void *thread_outfile_remove (void *p)
 {
   // some hash-dependent constants
 
-  opencl_ctx_t *opencl_ctx = data.opencl_ctx;
-  hashconfig_t *hashconfig = data.hashconfig;
-  hashes_t     *hashes     = data.hashes;
+  user_options_t *user_options = data.user_options;
+  opencl_ctx_t   *opencl_ctx   = data.opencl_ctx;
+  hashconfig_t   *hashconfig   = data.hashconfig;
+  hashes_t       *hashes       = data.hashes;
 
   uint dgst_size  = hashconfig->dgst_size;
   uint is_salted  = hashconfig->is_salted;
@@ -49,7 +50,7 @@ void *thread_outfile_remove (void *p)
   char separator  = hashconfig->separator;
 
   char *outfile_dir        = data.outfile_check_directory;
-  uint outfile_check_timer = data.outfile_check_timer;
+  uint outfile_check_timer = user_options->outfile_check_timer;
 
   // buffers
   hash_t hash_buf = { 0, 0, 0, 0, 0 };