From 1d59eab730746adeb8b417a50bf864d48c29db88 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Wed, 3 Mar 2010 15:40:22 +0100
Subject: Refuse to proceed without molecule.pdb

---
 src/indexamajig.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/indexamajig.c b/src/indexamajig.c
index ab4642b3..e2f50c4a 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -87,6 +87,7 @@ int main(int argc, char *argv[])
 	int config_verbose = 0;
 	IndexingMethod indm;
 	char *indm_str = NULL;
+	struct image image;
 
 	/* Long options */
 	const struct option longopts[] = {
@@ -163,20 +164,25 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
+	image.molecule = load_molecule();
+	if ( image.molecule == NULL ) {
+		ERROR("You must provide molecule.pdb in the working "
+		      "directory.\n");
+		return 1;
+	}
+
 	n_images = 0;
 	n_hits = 0;
 	do {
 
 		char line[1024];
 		struct hdfile *hdfile;
-		struct image image;
 
 		rval = fgets(line, 1023, fh);
 		if ( rval == NULL ) continue;
 		chomp(line);
 
 		image.features = NULL;
-		image.molecule = load_molecule();
 		image.data = NULL;
 		image.indexed_cell = NULL;
 
-- 
cgit v1.2.3