imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-04-02 21:47:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Provider load interface not opening

Browse Source
This commit is contained in:
WerWolv
2023-11-27 15:34:05 +01:00
parent af77b8dfc4
commit 494223fff6
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/builtin/source/content/events.cpp
View File

@@ -156,9 +156,7 @@ namespace hex::plugin::builtin {
EventManager::post<EventProviderOpened>(provider);
}
else if (provider->hasLoadInterface())
EventManager::post<RequestOpenPopup>(View::toWindowName("hex.builtin.view.provider_settings.load_popup"));
else {
else if (!provider->hasLoadInterface()) {
if (!provider->open() || !provider->isAvailable()) {
PopupError::open(hex::format("hex.builtin.provider.error.open"_lang, provider->getErrorMessage()));
TaskManager::doLater([provider] { ImHexApi::Provider::remove(provider); });

8
plugins/builtin/source/content/views/view_provider_settings.cpp
View File

@@ -6,9 +6,9 @@
namespace hex::plugin::builtin {
ViewProviderSettings::ViewProviderSettings() : View::Modal("hex.builtin.view.provider_settings.name") {
EventManager::subscribe<EventProviderCreated>(this, [](const hex::prv::Provider *provider) {
EventManager::subscribe<EventProviderCreated>(this, [this](const hex::prv::Provider *provider) {
if (provider->hasLoadInterface() && !provider->shouldSkipLoadInterface())
EventManager::post<RequestOpenPopup>(View::toWindowName("hex.builtin.view.provider_settings.load_popup"));
this->getWindowOpenState() = true;
});
ContentRegistry::Interface::addSidebarItem(ICON_VS_SERVER_PROCESS, [] {
@@ -40,9 +40,12 @@ namespace hex::plugin::builtin {
if (ImGui::Button("hex.builtin.common.open"_lang)) {
if (provider->open()) {
EventManager::post<EventProviderOpened>(provider);
this->getWindowOpenState() = false;
ImGui::CloseCurrentPopup();
}
else {
this->getWindowOpenState() = false;
ImGui::CloseCurrentPopup();
auto errorMessage = provider->getErrorMessage();
if (errorMessage.empty()) {
@@ -59,6 +62,7 @@ namespace hex::plugin::builtin {
if (ImGui::Button("hex.builtin.common.cancel"_lang)) {
ImGui::CloseCurrentPopup();
this->getWindowOpenState() = false;
TaskManager::doLater([=] { ImHexApi::Provider::remove(provider); });
}
}

7
plugins/windows/include/content/providers/process_memory_provider.hpp
View File

@@ -37,10 +37,13 @@ namespace hex::plugin::windows {
[[nodiscard]] std::string getName() const override { return hex::format("hex.windows.provider.process_memory.name"_lang, this->m_selectedProcess != nullptr ? this->m_selectedProcess->name : ""); }
[[nodiscard]] std::vector<Description> getDataDescription() const override {
return {
if (this->m_selectedProcess == nullptr)
return {};
else
return {
{ "hex.windows.provider.process_memory.process_name"_lang, this->m_selectedProcess->name },
{ "hex.windows.provider.process_memory.process_id"_lang, std::to_string(this->m_selectedProcess->id) }
};
};
}
[[nodiscard]] bool open() override;