fix merge

UniStuttgart-VISUS · Sep 17, 2021 · 112af8f · 112af8f
1 parent 7894ace
commit 112af8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/frontend/services/gui/src/GUIManager.cpp b/frontend/services/gui/src/GUIManager.cpp
@@ -331,14 +331,14 @@ bool GUIManager::PostDraw() {
             return false;
         }
         // Check for existing imgui context
-        if (this->context == nullptr) {
+        if (this->imgui_context == nullptr) {
             megamol::core::utility::log::Log::DefaultLog.WriteError(
                 "[GUI] No valid ImGui context available. [%s, %s, line %d]\n", __FILE__, __FUNCTION__, __LINE__);
             return false;
         }
 
         // Set ImGui context
-        ImGui::SetCurrentContext(this->context);
+        ImGui::SetCurrentContext(this->imgui_context);
         ImGuiIO& io = ImGui::GetIO();
         ImGuiStyle& style = ImGui::GetStyle();
 

diff --git a/frontend/services/gui/src/GUIManager.h b/frontend/services/gui/src/GUIManager.h
@@ -10,8 +10,8 @@
 #pragma once
 
 
-#include "implot.h"
 #include "CommandRegistry.h"
+#include "implot.h"
 #include "mmcore/CoreInstance.h"
 #include "mmcore/MegaMolGraph.h"
 #include "mmcore/utility/Picking_gl.h"