X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=pctb%2Fconvert.c;h=21445c563b6108ed117304c8a27fb9eb4fdd23ab;hp=433b043a3dadd5a043f7f9087733c21262e12160;hb=1c6f4876b9a4f76f89a0df81ec2cc6c4ec76334e;hpb=6d7c97eb148bbc805f506a5d7453daafa6a18898;ds=sidebyside

diff --git a/pctb/convert.c b/pctb/convert.c
index 433b043..21445c5 100644
--- a/pctb/convert.c
+++ b/pctb/convert.c
@@ -226,8 +226,14 @@ int main(int argc, char **argv) {
   /* Consequential changes to options */
 
   if (o_mode & mf_analyse) {
-    if (!o_outmode_kind)
-      o_outmode_kind= (o_flags & ff_printisland) ? omk_none : omk_str;
+    if (!o_outmode_kind) {
+      if (o_flags & ff_printisland) {
+	o_outmode_kind= omk_none;
+	o_flags |= ff_singlepage;
+      } else {
+	o_outmode_kind= omk_str;
+      }
+    }
 
     if (o_outmode_kind==omk_upload) {
       o_flags |= ffs_upload;
@@ -264,12 +270,12 @@ int main(int argc, char **argv) {
   if (!ocean)  ocean=  o_ocean;
   if (!pirate) pirate= o_pirate;
   
-  if (o_flags & ff_needisland) {
+  if (o_flags & ff_needisland)
     if (!ocean)
       badusage("need --ocean option when replaying images"
 	       " (consider supplying --pirate too)");
+  if (ocean)
     sysassert(! setenv("YPPSC_OCEAN",ocean,1) );
-  }
   if (pirate && (o_flags & ff_dict_pirate))
     sysassert(! setenv("YPPSC_PIRATE",pirate,1) );