From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Fri, 3 Jul 2009 19:29:00 +0000 (+0100)
Subject: Fix up --same --upload thing to only apply to --same
X-Git-Tag: 1.9.2~54^2~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=ef1a9d783f52a2d304e5872b6bb1f066621a5acf

Fix up --same --upload thing to only apply to --same
---

diff --git a/pctb/convert.c b/pctb/convert.c
index 950300b..f3b87fe 100644
--- a/pctb/convert.c
+++ b/pctb/convert.c
@@ -82,9 +82,6 @@ static void open_screenshot_file(const char *mode) {
   if (!screenshot_file)
     fatal("could not open screenshots file `%s': %s",
 	  o_screenshot_fn, strerror(errno));
-
-  if ((o_flags & ff_upload) && !(o_flags & ff_testservers))
-    badusage("must not reuse screenshots for upload to live PCTB database");
 }
 
 static void run_analysis(void) {
@@ -300,6 +297,8 @@ int main(int argc, char **argv) {
     progress_log("OK for you to move the mouse now.");
   }
   if (o_mode & mf_readscreenshot) {
+    if ((o_flags & ff_upload) && !(o_flags & ff_testservers))
+      badusage("must not reuse screenshots for upload to live PCTB database");
     open_screenshot_file("r");
     if (o_flags & ff_singlepage) read_one_screenshot();
     else read_screenshots();