Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-12-01 02:37:18 +01:00
Code Releases Wiki Activity

fix: Saving interface.ini file failing if imhex is installed in a non-writable location

Browse Source 
Fixes #473
This commit is contained in:
WerWolv 2022-03-16 13:23:36 +01:00
parent f2159e26d2
commit 844845223f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/source/window/window.cpp
View File

@ -119,7 +119,9 @@ namespace hex {
constexpr auto CrashBackupFileName = "crash_backup.hexproj"; constexpr auto CrashBackupFileName = "crash_backup.hexproj";
EventManager::subscribe<EventAbnormalTermination>(this, [CrashBackupFileName](int signal) { EventManager::subscribe<EventAbnormalTermination>(this, [this, CrashBackupFileName](int signal) {
ImGui::SaveIniSettingsToDisk(this->m_imguiSettingsPath.string().c_str());
if (!ProjectFile::hasUnsavedChanges()) if (!ProjectFile::hasUnsavedChanges())
return; return;
@ -603,7 +605,7 @@ namespace hex {
return; return;
for (u32 i = 0; i < count; i++) { for (u32 i = 0; i < count; i++) {
auto path = std::filesystem::path(reinterpret_cast<const char8_t *>(paths[i])); auto path = std::fs::path(reinterpret_cast<const char8_t *>(paths[i]));
bool handled = false; bool handled = false;
for (const auto &[extensions, handler] : ContentRegistry::FileHandler::getEntries()) { for (const auto &[extensions, handler] : ContentRegistry::FileHandler::getEntries()) {
@ -721,12 +723,12 @@ namespace hex {
ImGui::GetCurrentContext()->SettingsHandlers.push_back(handler); ImGui::GetCurrentContext()->SettingsHandlers.push_back(handler);
for (const auto &dir : fs::getDefaultPaths(fs::ImHexPath::Config)) { for (const auto &dir : fs::getDefaultPaths(fs::ImHexPath::Config)) {
if (std::filesystem::exists(dir)) { if (std::fs::exists(dir) && fs::isPathWritable(dir)) {
this->m_imguiSettingsPath = dir / "interface.ini"; this->m_imguiSettingsPath = dir / "interface.ini";
io.IniFilename = nullptr;
break; break;
} }
} }
io.IniFilename = nullptr;
if (!this->m_imguiSettingsPath.empty() && fs::exists(this->m_imguiSettingsPath)) if (!this->m_imguiSettingsPath.empty() && fs::exists(this->m_imguiSettingsPath))
ImGui::LoadIniSettingsFromDisk(this->m_imguiSettingsPath.string().c_str()); ImGui::LoadIniSettingsFromDisk(this->m_imguiSettingsPath.string().c_str());