From dec05988f40153fb5a9ce0e9661eca65fbebb1dd Mon Sep 17 00:00:00 2001 From: Corne Dorrestijn Date: Wed, 13 Aug 2014 14:16:55 +0200 Subject: [PATCH] Fixes for windows --- atom/browser/api/atom_api_app.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc index 19e6e677b4b..17ce3435882 100644 --- a/atom/browser/api/atom_api_app.cc +++ b/atom/browser/api/atom_api_app.cc @@ -78,9 +78,16 @@ std::string App::GetDataPath() { CHECK(PathService::Get(base::DIR_APP_DATA, &path)); #endif - base::FilePath dataPath = path.Append(base::FilePath::FromUTF8Unsafe(Browser::Get()->GetName())); + base::FilePath data_path = path.Append( + base::FilePath::FromUTF8Unsafe(Browser::Get()->GetName())); - return dataPath.value(); + // FilePath.value() returns a std::wstring in windows and + // std::string on other platforms. + std::vector writable(data_path.value().begin(), + data_path.value().end()); + writable.push_back('\0'); + + return &writable[0]; } mate::ObjectTemplateBuilder App::GetObjectTemplateBuilder(