--- qsampler/trunk/src/qsamplerMainForm.cpp	2019/03/27 18:31:09	3507
+++ qsampler/trunk/src/qsamplerMainForm.cpp	2019/04/01 22:36:26	3508
@@ -1,7 +1,7 @@
 // qsamplerMainForm.cpp
 //
 /****************************************************************************
-   Copyright (C) 2004-2018, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2004-2019, rncbc aka Rui Nuno Capela. All rights reserved.
    Copyright (C) 2007,2008,2015 Christian Schoenebeck
 
    This program is free software; you can redistribute it and/or
@@ -109,14 +109,25 @@
 #include <signal.h>
 
 // File descriptor for SIGUSR1 notifier.
-static int g_fdUsr1[2];
+static int g_fdSigusr1[2];
 
 // Unix SIGUSR1 signal handler.
 static void qsampler_sigusr1_handler ( int /* signo */ )
 {
 	char c = 1;
 
-	(::write(g_fdUsr1[0], &c, sizeof(c)) > 0);
+	(::write(g_fdSigusr1[0], &c, sizeof(c)) > 0);
+}
+
+// File descriptor for SIGTERM notifier.
+static int g_fdSigterm[2];
+
+// Unix SIGTERM signal handler.
+static void qsampler_sigterm_handler ( int /* signo */ )
+{
+	char c = 1;
+
+	(::write(g_fdSigterm[0], &c, sizeof(c)) > 0);
 }
 
 #endif	// HAVE_SIGNAL_H
@@ -233,25 +244,48 @@
 	// LADISH Level 1 suport.
 
 	// Initialize file descriptors for SIGUSR1 socket notifier.
-	::socketpair(AF_UNIX, SOCK_STREAM, 0, g_fdUsr1);
-	m_pUsr1Notifier
-		= new QSocketNotifier(g_fdUsr1[1], QSocketNotifier::Read, this);
+	::socketpair(AF_UNIX, SOCK_STREAM, 0, g_fdSigusr1);
+	m_pSigusr1Notifier
+		= new QSocketNotifier(g_fdSigusr1[1], QSocketNotifier::Read, this);
 
-	QObject::connect(m_pUsr1Notifier,
+	QObject::connect(m_pSigusr1Notifier,
 		SIGNAL(activated(int)),
 		SLOT(handle_sigusr1()));
 
 	// Install SIGUSR1 signal handler.
-    struct sigaction usr1;
-    usr1.sa_handler = qsampler_sigusr1_handler;
-    sigemptyset(&usr1.sa_mask);
-    usr1.sa_flags = 0;
-    usr1.sa_flags |= SA_RESTART;
-    ::sigaction(SIGUSR1, &usr1, NULL);
+    struct sigaction sigusr1;
+    sigusr1.sa_handler = qsampler_sigusr1_handler;
+    sigemptyset(&sigusr1.sa_mask);
+    sigusr1.sa_flags = 0;
+    sigusr1.sa_flags |= SA_RESTART;
+    ::sigaction(SIGUSR1, &sigusr1, NULL);
+
+	// Initialize file descriptors for SIGTERM socket notifier.
+	::socketpair(AF_UNIX, SOCK_STREAM, 0, g_fdSigterm);
+	m_pSigtermNotifier
+		= new QSocketNotifier(g_fdSigterm[1], QSocketNotifier::Read, this);
+
+	QObject::connect(m_pSigtermNotifier,
+		SIGNAL(activated(int)),
+		SLOT(handle_sigterm()));
+
+	// Install SIGTERM signal handler.
+	struct sigaction sigterm;
+	sigterm.sa_handler = qsampler_sigterm_handler;
+	::sigemptyset(&sigterm.sa_mask);
+	sigterm.sa_flags = 0;
+	sigterm.sa_flags |= SA_RESTART;
+	::sigaction(SIGTERM, &sigterm, NULL);
+	::sigaction(SIGQUIT, &sigterm, NULL);
+
+	// Ignore SIGHUP/SIGINT signals.
+	::signal(SIGHUP, SIG_IGN);
+	::signal(SIGINT, SIG_IGN);
 
 #else	// HAVE_SIGNAL_H
 
-	m_pUsr1Notifier = NULL;
+	m_pSigusr1Notifier = NULL;
+	m_pSigtermNotifier = NULL;
 	
 #endif	// !HAVE_SIGNAL_H
 
@@ -430,8 +464,10 @@
 #endif
 
 #if defined(HAVE_SIGNAL_H) && defined(HAVE_SYS_SOCKET_H)
-	if (m_pUsr1Notifier)
-		delete m_pUsr1Notifier;
+	if (m_pSigusr1Notifier)
+		delete m_pSigusr1Notifier;
+	if (m_pSigtermNotifier)
+		delete m_pSigtermNotifier;
 #endif
 
 	// Finally drop any widgets around...
@@ -721,11 +757,24 @@
 
 	char c;
 
-	if (::read(g_fdUsr1[1], &c, sizeof(c)) > 0)
+	if (::read(g_fdSigusr1[1], &c, sizeof(c)) > 0)
 		saveSession(false);
 
 #endif
 }
+
+
+void MainForm::handle_sigterm (void)
+{
+#if defined(HAVE_SIGNAL_H) && defined(HAVE_SYS_SOCKET_H)
+
+	char c;
+
+	if (::read(g_fdSigterm[1], &c, sizeof(c)) > 0)
+		close();
+
+#endif
+}
 
 
 void MainForm::updateViewMidiDeviceStatusMenu (void)