Merge branch 'upstream' into dfsg_clean20161022+dfsg

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main.mlton.sml b/src/main.mlton.sml
index 6d368106..fb1a1723 100644
--- a/src/main.mlton.sml
+++ b/src/main.mlton.sml
@@ -254,7 +254,8 @@ fun send (sock, s) =
             send (sock, String.extract (s, n, NONE))
     end
 
-val () = case CommandLine.arguments () of
+val () = (Globals.setResetTime ();
+          case CommandLine.arguments () of
              ["daemon", "start"] =>
              (case Posix.Process.fork () of
                   SOME _ => ()
@@ -376,4 +377,4 @@ val () = case CommandLine.arguments () of
                  else
                      (OS.FileSys.remove socket;
                       raise OS.SysErr ("", NONE))
-             end handle OS.SysErr _ => OS.Process.exit (oneRun args)
+             end handle OS.SysErr _ => OS.Process.exit (oneRun args))