Merge pull request #1873 from ghutchis/revert-forcefield-delay

OpenChemistry · Dec 19, 2024 · 33bce45 · 33bce45
2 parents 67580db + d66a526
commit 33bce45
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/avogadro/qtplugins/forcefield/forcefield.cpp b/avogadro/qtplugins/forcefield/forcefield.cpp
@@ -117,19 +117,7 @@ Forcefield::Forcefield(QObject* parent_)
   connect(action, SIGNAL(triggered()), SLOT(unfreezeSelected()));
   m_actions.push_back(action);
 
-  // single-shot timer to allow the GUI to start up
-  QTimer::singleShot(500, this, SLOT(deferredStart()));
-}
-
-Forcefield::~Forcefield() {}
-
-QList<QAction*> Forcefield::actions() const
-{
-  return m_actions;
-}
-
-void Forcefield::deferredStart()
-{
+  // initialize the calculators
 
   // prefer to use Python interface scripts if available
   refreshScripts();
@@ -150,6 +138,13 @@ void Forcefield::deferredStart()
 #endif
 }
 
+Forcefield::~Forcefield() {}
+
+QList<QAction*> Forcefield::actions() const
+{
+  return m_actions;
+}
+
 QStringList Forcefield::menuPath(QAction* action) const
 {
   QStringList path;

diff --git a/avogadro/qtplugins/forcefield/forcefield.h b/avogadro/qtplugins/forcefield/forcefield.h
@@ -76,8 +76,6 @@ private slots:
   void freezeSelected();
   void unfreezeSelected();
 
-  void deferredStart();
-
 private:
   QList<QAction*> m_actions;
   QtGui::Molecule* m_molecule = nullptr;

diff --git a/avogadro/vtk/CMakeLists.txt b/avogadro/vtk/CMakeLists.txt
@@ -1,3 +1,4 @@
+find_package(OpenGL REQUIRED)
 find_package(GLEW REQUIRED)
 
 if(WIN32 AND NOT BUILD_SHARED_LIBS)