From 7437400c185882205c664ca7b7c44fb832ac1059 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 29 Aug 2015 19:38:41 -0400
Subject: [PATCH 1/2] command-prompt: Prevent unloading when prompt is active

---
 plugins/command-prompt.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/command-prompt.cpp b/plugins/command-prompt.cpp
index bc3b89610..f762ed713 100644
--- a/plugins/command-prompt.cpp
+++ b/plugins/command-prompt.cpp
@@ -330,6 +330,13 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
     return CR_OK;
 }
 
+DFhackCExport command_result plugin_onstatechange (color_ostream &out, state_change_event e)
+{
+    if (e == SC_BEGIN_UNLOAD && Gui::getCurFocus() == "dfhack/commandprompt")
+        return CR_FAILURE;
+    return CR_OK;
+}
+
 DFhackCExport command_result plugin_shutdown ( color_ostream &out )
 {
     return CR_OK;

From 949e4d42cf3759ce0ba14e3663753be8948d0fb6 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 29 Aug 2015 19:42:32 -0400
Subject: [PATCH 2/2] Remove MacPool.*

---
 library/MacPool.h  | 12 ------------
 library/MacPool.mm | 22 ----------------------
 2 files changed, 34 deletions(-)
 delete mode 100644 library/MacPool.h
 delete mode 100644 library/MacPool.mm

diff --git a/library/MacPool.h b/library/MacPool.h
deleted file mode 100644
index f3b5dbebb..000000000
--- a/library/MacPool.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * MacPool.h
- * Handles creation and destruction of autorelease pool for DFHack on the Mac
- */
-
-#ifndef MACPOOL_H
-#define MACPOOL_H
-
-int create_pool();
-int destroy_pool();
-
-#endif
\ No newline at end of file
diff --git a/library/MacPool.mm b/library/MacPool.mm
deleted file mode 100644
index 8f26543e9..000000000
--- a/library/MacPool.mm
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * MacPool.m
- *
- */
-
-#import <Foundation/Foundation.h>
-#import "MacPool.h"
-
-NSAutoreleasePool *thePool;
-
-int create_pool() {
-    fprintf(stderr,"Creating autorelease pool\n");
-    thePool = [[NSAutoreleasePool alloc] init];
-    return 1;
-}
-
-int destroy_pool() {
-    fprintf(stderr,"Draining and releasing autorelease pool\n");
-    [thePool drain];
-    [thePool release];
-    return 0;
-}
\ No newline at end of file