From 406d6e25dcae8c1e36a4b87f8334bfed47e145fe Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Sun, 22 Oct 2006 13:14:33 +0000
Subject: [PATCH] Regulated coexistence of options -toc and -atip

---
 trunk/cdrskin/cdrskin.c           | 3 ++-
 trunk/cdrskin/cdrskin_timestamp.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/trunk/cdrskin/cdrskin.c b/trunk/cdrskin/cdrskin.c
index a0d0f777..d9defb0d 100644
--- a/trunk/cdrskin/cdrskin.c
+++ b/trunk/cdrskin/cdrskin.c
@@ -4439,7 +4439,8 @@ set_abort_max_wait:;
     "cdrskin: --any_track : will accept any unknown option as track source\n");
 
    } else if(strcmp(argv[i],"-atip")==0) {
-     skin->do_atip= 1;
+     if(skin->do_atip<1)
+       skin->do_atip= 1;
      if(skin->verbosity>=Cdrskin_verbose_cmD)
        printf("cdrskin: will put out some -atip style lines\n");
 
diff --git a/trunk/cdrskin/cdrskin_timestamp.h b/trunk/cdrskin/cdrskin_timestamp.h
index 11666761..5695dadc 100644
--- a/trunk/cdrskin/cdrskin_timestamp.h
+++ b/trunk/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2006.10.22.130341"
+#define Cdrskin_timestamP "2006.10.22.131452"