From cbca89e0985b3fedef686e8cfd83313dc40f7090 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Fri, 19 Apr 2024 18:29:51 +0200 Subject: [PATCH] Prevent crash when trying to load a cluster configuration when not being part of the cluster --- CMakeLists.txt | 2 +- apps/OpenSpace/ext/sgct | 2 +- src/rendering/luaconsole.cpp | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c2c22a0b7..ae544a4837 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ project(OpenSpace) set(OPENSPACE_VERSION_MAJOR 0) set(OPENSPACE_VERSION_MINOR 20) set(OPENSPACE_VERSION_PATCH 0) -set(OPENSPACE_VERSION_STRING "") +set(OPENSPACE_VERSION_STRING "rc-1") include(${PROJECT_SOURCE_DIR}/support/cmake/module_common.cmake) include(${PROJECT_SOURCE_DIR}/ext/ghoul/support/cmake/message_macros.cmake) diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index 1be7e65ef1..afed86f624 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit 1be7e65ef1d64fdbf28c86b468ac0ead59ab04a6 +Subproject commit afed86f62411893393b434e5f2baa698dd679069 diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp index fd1ea36d20..ac2a888ebe 100644 --- a/src/rendering/luaconsole.cpp +++ b/src/rendering/luaconsole.cpp @@ -251,6 +251,10 @@ void LuaConsole::initialize() { void LuaConsole::deinitialize() { ZoneScoped; + if (!FileSys.cacheManager()) { + return; + } + const std::filesystem::path filename = FileSys.cacheManager()->cachedFilename( HistoryFile, ""