From f0884b1529da67ec914b105b0d8b53435de47eae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Skowro=C5=84ski?=
 <patrykskowronski@Patryks-Mini.lan>
Date: Wed, 18 Sep 2024 13:13:08 +0200
Subject: [PATCH] Fixed detection of startup workbench

---
 src/Gui/3Dconnexion/navlib/NavlibNavigation.cpp | 3 ++-
 src/Gui/3Dconnexion/navlib/NavlibPivot.cpp      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Gui/3Dconnexion/navlib/NavlibNavigation.cpp b/src/Gui/3Dconnexion/navlib/NavlibNavigation.cpp
index 00e40ba46c..9944cf3bda 100644
--- a/src/Gui/3Dconnexion/navlib/NavlibNavigation.cpp
+++ b/src/Gui/3Dconnexion/navlib/NavlibNavigation.cpp
@@ -182,7 +182,8 @@ void NavlibInterface::enableNavigation()
         exportCommands(std::string(wb));
     });
 
-    exportCommands("StartWorkbench");
+    auto activeWorkbench = Gui::WorkbenchManager::instance()->activeName();
+    exportCommands(activeWorkbench);
 
     initializePivot();
     connectActiveTab();
diff --git a/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp b/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp
index 716fcdb796..87505613b4 100644
--- a/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp
+++ b/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp
@@ -113,7 +113,7 @@ extern template SoCamera* NavlibInterface::getCamera<SoCamera*>() const;
 
 long NavlibInterface::GetHitLookAt(navlib::point_t& position) const
 {
-    if (is2DView())
+    if (is2DView() || !is3DView())
         return navlib::make_result_code(navlib::navlib_errc::no_data_available);
 
     const Gui::View3DInventorViewer* const inventorViewer = currentView.pView3d->getViewer();