]> git.eshelyaron.com Git - emacs.git/commitdiff
* src/emacs.c (load_pdump): Fix a thinko in last change.
authorEli Zaretskii <eliz@gnu.org>
Sat, 26 Jan 2019 17:48:33 +0000 (19:48 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sat, 26 Jan 2019 17:48:33 +0000 (19:48 +0200)
src/emacs.c

index 8a440de28a7e35a61452f3d2eb7e1b320b2421f2..aed4e0d1508d7b7f1feb6d6f7c38a1fa442ee554 100644 (file)
@@ -780,11 +780,10 @@ load_pdump (int argc, char **argv)
   sprintf (dump_file, "%s%c%s%s",
            path_exec, DIRECTORY_SEP, argv0_base, suffix);
   result = pdumper_load (dump_file);
+  if (result == PDUMPER_LOAD_SUCCESS)
+    goto out;
 
-  if (result != PDUMPER_LOAD_FILE_NOT_FOUND)
-    fatal ("could not load dump file \"%s\": %s",
-           dump_file, dump_error_to_string (result));
-  if (result != PDUMPER_LOAD_SUCCESS)
+  if (result == PDUMPER_LOAD_FILE_NOT_FOUND)
     {
       /* Finally, look for basename(argv[0])+".pdmp" in PATH_EXEC.
         This way, they can rename both the executable and its pdump
@@ -814,6 +813,10 @@ load_pdump (int argc, char **argv)
               path_exec, DIRECTORY_SEP, argv0_base, suffix);
       result = pdumper_load (dump_file);
     }
+  else
+    fatal ("could not load dump file \"%s\": %s",
+           dump_file, dump_error_to_string (result));
+
   if (result != PDUMPER_LOAD_SUCCESS)
     dump_file = NULL;