Clean up shutdown process

1 files changed, 8 insertions, 4 deletions

diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index 53b3635753..9c126fc3da 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -1221,13 +1221,14 @@ int CommandLineRPC(int argc, char *argv[])
                 strPrint = write_string(result, true);
         }
     }
-    catch (std::exception& e)
-    {
+    catch (boost::thread_interrupted) {
+        throw;
+    }
+    catch (std::exception& e) {
         strPrint = string("error: ") + e.what();
         nRet = 87;
     }
-    catch (...)
-    {
+    catch (...) {
         PrintException(NULL, "CommandLineRPC()");
     }
 
@@ -1265,6 +1266,9 @@ int main(int argc, char *argv[])
             return CommandLineRPC(argc, argv);
         }
     }
+    catch (boost::thread_interrupted) {
+        throw;
+    }
     catch (std::exception& e) {
         PrintException(&e, "main()");
     } catch (...) {