From 10574f9db324807f9455ebb4144b88063afd77dc Mon Sep 17 00:00:00 2001 From: Ondrej Hrusovsky Date: Wed, 13 Dec 2023 15:22:20 +0100 Subject: [PATCH 1/5] Fix possible crash when GetPlayerInput() is nullptr on startup --- .../Source/CogInput/Private/CogInputWindow_Actions.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp index 69e8f49..dca7363 100644 --- a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp +++ b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp @@ -64,6 +64,12 @@ void FCogInputWindow_Actions::RenderContent() ImGui::Text("No Enhanced Input Subsystem"); return; } + + if(EnhancedInputSubsystem->GetPlayerInput() == nullptr) + { + ImGui::Text("No Player Input"); + return; + } if (ImGui::BeginMenuBar()) { @@ -233,4 +239,4 @@ void FCogInputWindow_Actions::DrawAxis(const char* Format, const char* ActionNam ImGui::SetNextItemWidth(-1); FCogWindowWidgets::SliderWithReset("##Inject", InjectValue, -1.0f, 1.0f, 0.0f, "%0.2f"); ImGui::PopID(); -} \ No newline at end of file +} From 5e7cdaad663678eaee64e465a4e62ae6e26cb9b6 Mon Sep 17 00:00:00 2001 From: Ondrej Hrusovsky Date: Wed, 13 Dec 2023 15:24:53 +0100 Subject: [PATCH 2/5] Update CogInputWindow_Actions.cpp --- .../Source/CogInput/Private/CogInputWindow_Actions.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp index dca7363..2f99e61 100644 --- a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp +++ b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp @@ -66,10 +66,10 @@ void FCogInputWindow_Actions::RenderContent() } if(EnhancedInputSubsystem->GetPlayerInput() == nullptr) - { - ImGui::Text("No Player Input"); - return; - } + { + ImGui::Text("No Player Input"); + return; + } if (ImGui::BeginMenuBar()) { From 54ca8072c0e28f8307f9e33839e99e400e23ecda Mon Sep 17 00:00:00 2001 From: Ondrej Hrusovsky Date: Wed, 13 Dec 2023 15:25:51 +0100 Subject: [PATCH 3/5] Update CogInputWindow_Actions.cpp From a9956ae45aaa75a9bbb3c0933dde119ca8aa25b6 Mon Sep 17 00:00:00 2001 From: Ondrej Hrusovsky Date: Wed, 13 Dec 2023 15:38:35 +0100 Subject: [PATCH 4/5] Fix space at the end of file --- .../CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp index 2f99e61..5e58458 100644 --- a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp +++ b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp @@ -239,4 +239,4 @@ void FCogInputWindow_Actions::DrawAxis(const char* Format, const char* ActionNam ImGui::SetNextItemWidth(-1); FCogWindowWidgets::SliderWithReset("##Inject", InjectValue, -1.0f, 1.0f, 0.0f, "%0.2f"); ImGui::PopID(); -} +} From 7fa0f267b23197e8a6b13cfd9eb7b438899639dd Mon Sep 17 00:00:00 2001 From: Ondrej Hrusovsky Date: Wed, 13 Dec 2023 15:39:06 +0100 Subject: [PATCH 5/5] Fix space at the end of file --- .../CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp index 5e58458..2f99e61 100644 --- a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp +++ b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp @@ -239,4 +239,4 @@ void FCogInputWindow_Actions::DrawAxis(const char* Format, const char* ActionNam ImGui::SetNextItemWidth(-1); FCogWindowWidgets::SliderWithReset("##Inject", InjectValue, -1.0f, 1.0f, 0.0f, "%0.2f"); ImGui::PopID(); -} +}