Merge branch 'refs/heads/t/i9e'

[paraslash.git] / fade.c

diff --git a/fade.c b/fade.c
index 543a666dd0e32fbf106d263d3cf96e1bb11ce136..e05e31733623dacae4beddad69580d077ad23a0d 100644 (file)
--- a/fade.c
+++ b/fade.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 1998-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1998 Andre Noll <maan@tuebingen.mpg.de>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -203,7 +203,7 @@ static int sweet_dreams(struct mixer *m, struct mixer_handle *h)
                tm = localtime(&t1);
        }
        wake_time_epoch = mktime(tm);
                tm = localtime(&t1);
        }
        wake_time_epoch = mktime(tm);

-       PARA_INFO_LOG("waketime: %s", asctime(tm));
+       PARA_INFO_LOG("waketime: %u:%02u\n", tm->tm_hour, tm->tm_min);

        client_cmd("stop");
        sleep(1);
        if (fot) {
        client_cmd("stop");
        sleep(1);
        if (fot) {