X-Git-Url: https://vaikene.ee/gitweb/highlight.css?a=blobdiff_plain;f=src%2Fmain%2FGUI%2Fmain.cpp;h=30f1500923177dd8da0545a2d1e18b582c310078;hb=be0e791df48f5a8c9bb4c16f65b62e41e1149552;hp=45c5043f87e7a53aa3aa802fe9a7c1ad24dbd05c;hpb=4d81227da330c21c7aa0badc88bd5ad4467067fb;p=evaf

diff --git a/src/main/GUI/main.cpp b/src/main/GUI/main.cpp
index 45c5043..30f1500 100644
--- a/src/main/GUI/main.cpp
+++ b/src/main/GUI/main.cpp
@@ -29,9 +29,10 @@
 
 #include <Common/Globals>
 #include <Common/iLogger>
-#include <Common/iEnv>
 #include <Common/iApp>
 
+#include <Plugins/PluginManager>
+
 #include <QtGui>
 
 #ifdef Q_OS_LINUX
@@ -261,7 +262,6 @@ void Application::printHelp()
         "  -lang[uage]=xx[_CC] Specifies the language, where xx is the ISO 639\n"
         "                   language code followed by an optional ISO 3166 country\n"
         "                   code.\n"
-        // Handled by the iEnv interface implementation
         "  -root[dir]=DIR   Specifies the application's root directory.\n"
         "  -dataroot[dir]=DIR Specifies the data root directory.\n"
         "  -etc[dir]=DIR    Specifies the configuration files directory.\n"
@@ -390,7 +390,7 @@ int main(int argc, char ** argv)
         return 1;
 
     // Plugin manager
-    // Plugins::PluginManager pluginManager;
+    Plugins::PluginManager pluginManager;
 
     // The main run loop
     bool quit = false;
@@ -404,10 +404,11 @@ int main(int argc, char ** argv)
             return 1;
 
         // Initialize the plugin manager and load plugins
-        //if (!pluginManager.init())
-        //    return 1;
+        if (!pluginManager.init())
+            return 1;
 
         // Run the application
+        EVAF_INFO("Running %s", VER_MODULE_NAME_STR);
         rval = app.exec();
 
         quit = rval != Common::iApp::RC_Restart;
@@ -415,7 +416,7 @@ int main(int argc, char ** argv)
         EVAF_INFO("%s is %s", VER_MODULE_NAME_STR, quit ? "exiting" : "restarting");
 
         // Unload plugins and finalize the plugin manager
-        // pluginManager.done();
+        pluginManager.done();
     }
 
     EVAF_INFO("%s exit with code %d", VER_MODULE_NAME_STR, rval);