Set magic from -m before processing queries (-Q) or dumping variables (-D)

diff --git a/main.c b/main.c
index 3d3c0f1fad98d64c7306385b2b7d6831778f2c88..b984d70420ee9a8584b204a1434163aad8b08d7e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -741,6 +741,9 @@ int main (int argc, char **argv)
   /* Initialize crypto backends.  */
   crypt_init ();
 
+  if (newMagic)
+    mx_set_magic (newMagic);
+
   if (queries)
   {
     for (; optind < argc; optind++)
@@ -773,9 +776,6 @@ int main (int argc, char **argv)
     return rv;
   }
 
-  if (newMagic)
-    mx_set_magic (newMagic);
-
   if (!option (OPTNOCURSES))
   {
     SETCOLOR (MT_COLOR_NORMAL);