From d8648d2f3335188c97f5439fab4bf2993485fe63 Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Mon, 24 Aug 2009 22:38:13 +0200
Subject: [PATCH] always restore old cerr buffer at exit

---
 src/ncmpcpp.cpp | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index 63721086..69c2c6bc 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -80,6 +80,22 @@ bool Global::BlockItemListUpdate = 0;
 bool Global::MessagesAllowed = 0;
 bool Global::RedrawHeader = 1;
 
+namespace
+{
+	std::ofstream errorlog;
+	std::streambuf *cerr_buffer;
+	
+	void do_at_exit()
+	{
+		// restore old cerr buffer
+		std::cerr.rdbuf(cerr_buffer);
+		errorlog.close();
+		Mpd.Disconnect();
+		DestroyScreen();
+		WindowTitle("");
+	}
+}
+
 int main(int argc, char *argv[])
 {
 	CreateConfigDir();
@@ -106,9 +122,12 @@ int main(int argc, char *argv[])
 	if (!ConnectToMPD())
 		return -1;
 	
+	// always execute these commands, even if ncmpcpp use exit function
+	atexit(do_at_exit);
+	
 	// redirect std::cerr output to ~/.ncmpcpp/error.log file
-	std::ofstream errorlog((config_dir + "error.log").c_str(), std::ios::app);
-	std::streambuf *cerr_buffer = std::cerr.rdbuf();
+	errorlog.open((config_dir + "error.log").c_str(), std::ios::app);
+	cerr_buffer = std::cerr.rdbuf();
 	std::cerr.rdbuf(errorlog.rdbuf());
 	
 	InitScreen("ncmpc++ ver. "VERSION, Config.colors_enabled);
@@ -1996,12 +2015,6 @@ int main(int argc, char *argv[])
 #		endif // ENABLE_CLOCK
 		// key mapping end
 	}
-	// restore old cerr buffer
-	std::cerr.rdbuf(cerr_buffer);
-	errorlog.close();
-	Mpd.Disconnect();
-	DestroyScreen();
-	WindowTitle("");
 	return 0;
 }