CFileNameManager::IsPrivateSettings()追加

sanomari · Oct 19, 2020 · d599793 · d599793
1 parent 9d3d926
commit d599793
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/sakura_core/env/CFileNameManager.cpp b/sakura_core/env/CFileNameManager.cpp
@@ -551,6 +551,13 @@ void CFileNameManager::GetIniFileNameDirect( LPWSTR pszPrivateIniFile, LPWSTR ps
 	}
 }
 
+/* iniファイルの保存先がユーザ別設定フォルダかどうか */
+bool CFileNameManager::IsPrivateSettings() const
+{
+	const auto &iniFolder = m_pShareData->m_sFileNameManagement.m_IniFolder;
+	return iniFolder.m_szPrivateIniFile[0] != L'\0';
+}
+
 /**
 	iniファイル名の取得
 
@@ -564,8 +571,7 @@ void CFileNameManager::GetIniFileNameDirect( LPWSTR pszPrivateIniFile, LPWSTR ps
 void CFileNameManager::GetIniFileName( LPWSTR pszIniFileName ) const
 {
 	const auto &iniFolder = m_pShareData->m_sFileNameManagement.m_IniFolder;
-	const bool bPrivate = iniFolder.m_szPrivateIniFile[0] != L'\0';
 	const auto& szPrivateIniFile = iniFolder.m_szPrivateIniFile;
 	const auto& szIniFile = iniFolder.m_szIniFile;
-	::wcscpy_s( pszIniFileName, _MAX_PATH, bPrivate ? szPrivateIniFile : szIniFile );
+	::wcscpy_s( pszIniFileName, _MAX_PATH, IsPrivateSettings() ? szPrivateIniFile : szIniFile );
 }
diff --git a/sakura_core/env/CFileNameManager.h b/sakura_core/env/CFileNameManager.h
@@ -90,6 +90,7 @@ class CFileNameManager : public TSingleton<CFileNameManager>{
 	static WCHAR GetAccessKeyByIndex(int index, bool bZeroOrigin);
 
 	static void GetIniFileNameDirect( LPWSTR pszPrivateIniFile, LPWSTR pszIniFile, LPCWSTR pszProfName );	/* 構成設定ファイルからiniファイル名を取得する */	// 2007.09.04 ryoji
+	bool IsPrivateSettings() const;
 	void GetIniFileName( LPWSTR pszIniFileName ) const;	//!< iniファイル名の取得
 
 private:

diff --git a/sakura_core/env/CShareData.cpp b/sakura_core/env/CShareData.cpp
@@ -1102,7 +1102,7 @@ bool CShareData::OpenDebugWindow( HWND hwnd, bool bAllwaysActive )
 
 /* iniファイルの保存先がユーザ別設定フォルダかどうか */	// 2007.05.25 ryoji
 BOOL CShareData::IsPrivateSettings( void ){
-	return m_pShareData->m_sFileNameManagement.m_IniFolder.m_szPrivateIniFile[0] != L'\0';
+	return CFileNameManager::getInstance()->IsPrivateSettings();
 }
 
 /*