From 78f628e0af2f2df562c40ac1424b432b6a969055 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Fri, 28 Nov 2014 11:06:28 +0100
Subject: cleanup und bugfixes after refactoring

---
 src/shared/appconfig.inc  |  1 +
 src/shared/gameinfo.cpp   | 20 ++++----------------
 src/shared/gameinfo.h     |  2 --
 src/shared/skyriminfo.cpp |  2 +-
 4 files changed, 6 insertions(+), 19 deletions(-)

(limited to 'src/shared')

diff --git a/src/shared/appconfig.inc b/src/shared/appconfig.inc
index 080d3655..5d9d9f8e 100644
--- a/src/shared/appconfig.inc
+++ b/src/shared/appconfig.inc
@@ -1,5 +1,6 @@
 APPPARAM(std::wstring, translationPrefix, L"organizer")
 APPPARAM(std::wstring, pluginPath, L"plugins")
+APPPARAM(std::wstring, profilesPath, L"profiles")
 APPPARAM(std::wstring, stylesheetsPath, L"stylesheets")
 APPPARAM(std::wstring, profileTweakIni, L"profile_tweaks.ini")
 APPPARAM(std::wstring, logFile, L"ModOrganizer.log")
diff --git a/src/shared/gameinfo.cpp b/src/shared/gameinfo.cpp
index 5439efff..1a815701 100644
--- a/src/shared/gameinfo.cpp
+++ b/src/shared/gameinfo.cpp
@@ -27,12 +27,12 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "skyriminfo.h"
 #include "util.h"
 
+#include <boost/assign.hpp>
+#include <boost/format.hpp>
 
 #include <shlobj.h>
 #include <sstream>
 #include <cassert>
-#include <boost/assign.hpp>
-#include <boost/format.hpp>
 
 namespace MOShared {
 
@@ -49,7 +49,7 @@ GameInfo::GameInfo(const std::wstring &moDirectory, const std::wstring &moDataDi
 
 void GameInfo::cleanup() {
   delete GameInfo::s_Instance;
-  GameInfo::s_Instance = NULL;
+  GameInfo::s_Instance = nullptr;
 }
 
 
@@ -126,7 +126,7 @@ bool GameInfo::init(const std::wstring &moDirectory, const std::wstring &moDataD
 
 GameInfo &GameInfo::instance()
 {
-  assert(s_Instance != NULL);
+  assert(s_Instance != nullptr && "gameinfo not yet initialized");
   return *s_Instance;
 }
 
@@ -151,18 +151,6 @@ std::wstring GameInfo::getIniFilename() const
 }
 
 
-std::wstring GameInfo::getDownloadDir() const
-{
-  return m_OrganizerDirectory + L"\\downloads";
-}
-
-
-std::wstring GameInfo::getCacheDir() const
-{
-  return m_OrganizerDirectory + L"\\webcache";
-}
-
-
 std::wstring GameInfo::getOverwriteDir() const
 {
   return m_OrganizerDirectory + L"\\overwrite";
diff --git a/src/shared/gameinfo.h b/src/shared/gameinfo.h
index c11679f3..a9da0b97 100644
--- a/src/shared/gameinfo.h
+++ b/src/shared/gameinfo.h
@@ -109,8 +109,6 @@ public:
   virtual std::wstring getProfilesDir() const;
 
   virtual std::wstring getIniFilename() const;
-  virtual std::wstring getDownloadDir() const;
-  virtual std::wstring getCacheDir() const;
   virtual std::wstring getOverwriteDir() const;
   virtual std::wstring getLogDir() const;
   virtual std::wstring getLootDir() const;
diff --git a/src/shared/skyriminfo.cpp b/src/shared/skyriminfo.cpp
index 1203e3ed..7f70c097 100644
--- a/src/shared/skyriminfo.cpp
+++ b/src/shared/skyriminfo.cpp
@@ -259,7 +259,7 @@ void SkyrimInfo::createProfile(const std::wstring &directory, bool useDefaults)
       }
       if (!::CopyFileW(source.c_str(), target.c_str(), true)) {
         if (::GetLastError() != ERROR_FILE_EXISTS) {
-          throw windows_error(std::string("failed to copy ini file: ") + ToString(source, false));
+          throw windows_error(std::string("failed to copy ini file: ") + ToString(source, false) + " to " + ToString(target, false));
         }
       }
     }
-- 
cgit v1.3.1