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

fix: Project files failing to save when no custom encoding is loaded

Browse Source
This commit is contained in:
WerWolv 2023-05-04 23:23:44 +02:00
parent bec655a8c6
commit 5680b90549
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libimhex/source/api/project_file_manager.cpp
View File

@ -109,22 +109,26 @@ namespace hex {
bool result = true;
for (const auto &handler : ProjectFile::getHandlers()) {
try {
if (!handler.store(handler.basePath, tar))
if (!handler.store(handler.basePath, tar) && handler.required)
result = false;
} catch (std::exception &e) {
log::info("{}", e.what());
result = false;
if (handler.required)
result = false;
}
}
for (const auto &provider : ImHexApi::Provider::getProviders()) {
const auto basePath = std::fs::path(std::to_string(provider->getID()));
for (const auto &handler: ProjectFile::getProviderHandlers()) {
try {
if (!handler.store(provider, basePath / handler.basePath, tar))
if (!handler.store(provider, basePath / handler.basePath, tar) && handler.required)
result = false;
} catch (std::exception &e) {
log::info("{}", e.what());
result = false;
if (handler.required)
result = false;
}
}
}

3
plugins/builtin/source/content/views/view_hex_editor.cpp
View File

@ -900,10 +900,9 @@ namespace hex::plugin::builtin {
.store = [this](prv::Provider *, const std::fs::path &basePath, Tar &tar) {
if (const auto &encoding = this->m_hexEditor.getCustomEncoding(); encoding.has_value()) {
tar.writeString(basePath, encoding->getTableContent());
return true;
}
return false;
return true;
}
});
}

2
plugins/windows/source/content/ui_items.cpp
View File

@ -101,7 +101,7 @@ namespace hex::plugin::windows {
}
auto totalMem = memInfo.ullTotalPhys;
auto usedMem = pmc.PrivateUsage;
auto usedMem = pmc.WorkingSetSize;
ImGui::TextFormatted(ICON_FA_MICROCHIP " {0} / {1}", hex::toByteString(usedMem), hex::toByteString(totalMem));
});