Fixed problems with temporary char*.

thelaui · Apr 12, 2021 · a5114fe · a5114fe
1 parent 1e7c847
commit a5114fe
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/src/Locales/locales.cpp b/src/Locales/locales.cpp
@@ -151,12 +151,9 @@ namespace locales {
 	  */
 	 void setCurrentLocale() {
 		  char const * const dom = "marsshooter";
-
-		  char const * const localedir = (settings::C_dataPath + std::string("locale")).c_str();
-		  std::cout << "localedir " << localedir;
-
-		  char const * const loc =  getCurrentLocale().iso_.toAnsiString().c_str();
-		  std::cout << "localedir: " << localedir << " locale: " << loc << "\n";
+		  const std::string loc =  std::string(getCurrentLocale().iso_.toAnsiString());
+		  const std::string localedir = (settings::C_dataPath + std::string("locale"));
+		  std::cout << "localedir: " << localedir.c_str() << " locale: " << loc.c_str() << "\n";
 
 #ifndef _WIN32
 #ifndef __AMIGAOS4__
@@ -166,28 +163,28 @@ namespace locales {
 #endif
 #endif
 #ifdef __BEOS__
-		  setenv ("LANG",   loc, 1);
-		  setenv ("LC_ALL", loc, 1);
+		  setenv ("LANG",   loc.c_str(), 1);
+		  setenv ("LC_ALL", loc.c_str(), 1);
 #endif
 #ifdef __APPLE__
-		  setenv ("LANGUAGE", loc, 1);
-		  setenv ("LANG",     loc, 1);
-		  setenv ("LC_ALL",   loc, 1);
+		  setenv ("LANGUAGE", loc.c_str(), 1);
+		  setenv ("LANG",     loc.c_str(), 1);
+		  setenv ("LC_ALL",   loc.c_str(), 1);
 #endif
 #ifdef _WIN32
-		  _putenv_s("LANG", loc);
+		  _putenv_s("LANG", loc.c_str());
 #endif
 
 #ifdef __linux__
-		  setenv("LANGUAGE", loc, 1);
+		  setenv("LANGUAGE", loc.c_str(), 1);
 #endif
 		  // set locale according to the env. variables
 		  SETLOCALE(LC_ALL, "");
 		  SETLOCALE(LC_NUMERIC, "C");
 		  SETLOCALE(LC_MESSAGES, "");
 
 		  textdomain(dom);
-		  bindtextdomain(dom, localedir);
+		  bindtextdomain(dom, localedir.c_str());
 		  bind_textdomain_codeset(dom, "UTF-8");
 	 }