Also read window title from config/windows/ files. To facilitate that, also corrected...

[plomrogue] / src / rexit.c

diff --git a/src/rexit.c b/src/rexit.c
index 73d740ba4bd8e8d4e55809758dc9b1d000818dea..2497c034014a6e3d6b585b9d6a9b306aa6cc41c8 100644 (file)
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -2,12 +2,14 @@
 
 #include "rexit.h"
 #include <stdlib.h> /* for exit(), free(), defines EXIT_SUCESS, EXIT_FAILURE */
-#include <stdio.h> /* for printf() */
+#include <stdio.h> /* for printf(), perror() */
 #include <stdint.h> /* for uint8_t */
 #include <ncurses.h> /* for endwin() */
+#include <errno.h> /* for errno */
 #include "main.h" /* for World struct */
 #include "map.h" /* for Map struct */
 #include "keybindings.h" /* for KeysWinData, KeyBinding structs */
+#include "command_db.h" /* for free_command_db() */
 
 
 
@@ -41,6 +43,10 @@ static void cleanup(struct World * world)
     {
         free(world->log);
     }
+    if (cleanup_flags & CLEANUP_COMMAND_DB)
+    {
+        free_command_db(world);
+    }
 }
 
 
@@ -67,6 +73,15 @@ extern void exit_err(uint8_t err, struct World * world, char * msg)
         return;
     }
     cleanup(world);
-    printf("%s\n", msg);
+    if (NULL == msg)
+    {
+        msg = "Details unknown.";
+    }
+    printf("Aborted PlomRogue due to error. %s\nInternal error code: %d\n",
+           msg, err);
+    if (0 != errno)
+    {
+        perror("errno states");
+    }
     exit(EXIT_FAILURE);
 }