Merge branch 'master' of xmp.git.sf.net:/gitroot/xmp/xmp

src/main.c

@@ -284,7 +284,7 @@ int main(int argc, char **argv)
 				if (!control.loop && old_loop != mi.loop_count)
 					break;
 
-				if (!background) {
+				if (!background && options.verbose > 0) {
 					info_frame(&mi, &control, refresh_status);
 					refresh_status = 0;
 				}

src/options.c

@@ -205,7 +205,7 @@ void get_options(int argc, char **argv, struct options *options)
 			options->probeonly = 1;
 			break;
 		case 'q':
-			//options->verbosity = 0;
+			options->verbose = 0;
 			break;
 		case 'R':
 			options->random = 1;