Import Geant4 11.2.0 source tree

source/visualization/Qt3D/src/G4Qt3D.cc

@@ -74,28 +74,8 @@ G4VViewer* G4Qt3D::CreateViewer(G4VSceneHandler& scene,
 
 G4bool G4Qt3D::IsUISessionCompatible () const
 {
-  G4bool isCompatible = false;
-  G4UImanager* ui = G4UImanager::GetUIpointer();
-  G4UIsession* session = ui->GetSession();
-
-  // If session is a batch session, it may be:
-  // a) this is a batch job (the user has not instantiated any UI session);
-  // b) we are currently processing a UI command, in which case the UI
-  //    manager creates a temporary batch session and to find out if there is
-  //    a genuine UI session that the user has instantiated we must drill
-  //    down through previous sessions to a possible non-batch session.
-  while (G4UIbatch* batch = dynamic_cast<G4UIbatch*>(session)) {
-    session = batch->GetPreviousSession();
-  }
-
-  // Qt windows are only appropriate in a Qt session.
-  if (session) {
-    // If non-zero, this is the originating non-batch session
-    // The user has instantiated a UI session...
-    if (dynamic_cast<G4UIQt*>(session)) {
-      // ...and it's a G4UIQt session, which is OK.
-      isCompatible = true;
-    }
-  }
-  return isCompatible;
+  // Qt windows require a Qt session.
+  G4UIsession* baseSession = G4UImanager::GetUIpointer()->GetBaseSession();
+  if (dynamic_cast<G4UIQt*>(baseSession) != nullptr) return true;
+  return false;
 }