gnucash maint: Fix Travis failures from transcoding fixes.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/c4431607 (commit)
	from  https://github.com/Gnucash/gnucash/commit/14c30344 (commit)



commit c44316073735a47be49f4e190005c47621c308f8
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Apr 23 14:02:24 2018 -0700

    Fix Travis failures from transcoding fixes.

diff --git a/libgnucash/core-utils/gnc-filepath-utils.cpp b/libgnucash/core-utils/gnc-filepath-utils.cpp
index b144f06..4d00bab 100644
--- a/libgnucash/core-utils/gnc-filepath-utils.cpp
+++ b/libgnucash/core-utils/gnc-filepath-utils.cpp
@@ -66,11 +66,11 @@ extern "C" {
 
 #include <boost/filesystem.hpp>
 #include <boost/locale.hpp>
-#include <codecvt>
 #include <iostream>
 
 
 #if PLATFORM(WINDOWS)
+#include <codecvt>
 using codecvt = std::codecvt_utf8<wchar_t, 0x10FFFF, std::little_endian>;
 using string = std::wstring;
 #else
@@ -554,8 +554,8 @@ get_userdata_home(void)
     if (try_tmp_dir)
     {
 	bfs::path newpath(g_get_tmp_dir (), cvt);
-	newpath.imbue(bfs_locale);
-        userdata_home = std::move(newpath);
+        userdata_home = newpath / g_get_user_name ();
+	userdata_home.imbue(bfs_locale);
     }
     g_assert(!userdata_home.empty());
 



Summary of changes:
 libgnucash/core-utils/gnc-filepath-utils.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)