[Emacs-diffs] master 4eb78a4: * src/emacs.c (load_pdump): Fix a thinko in last change.

[Eli Zaretskii]

branch: master
commit 4eb78a47e0be59c6d7b886cfe82ce56b276a52bd
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    * src/emacs.c (load_pdump): Fix a thinko in last change.
---
 src/emacs.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/emacs.c b/src/emacs.c
index 8a440de..aed4e0d 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -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;