Merge branch 'Use_env_get_string' into CPlusPlus

Conflicts:
	function.cpp

1 files changed, 2 insertions, 1 deletions

diff --git a/reader.cpp b/reader.cpp
index 567ce63d..aaf9a060 100644
--- a/reader.cpp
+++ b/reader.cpp
@@ -606,7 +606,8 @@ int reader_interrupted()
 void reader_write_title()
 {
 	const wchar_t *title;
-	wchar_t *term = env_get( L"TERM" );
+	const wcstring term_str = env_get_string( L"TERM" );
+	const wchar_t *term = term_str.empty()?NULL:term_str.c_str(); 
 
 	/*
 	  This is a pretty lame heuristic for detecting terminals that do