Fixed|Server: ServerSystem init and shutdown

Presently ServerSystem is dependent on LegacyNetwork, so it must be deleted before LegacyCore is deleted.
skyjake · Feb 18, 2013 · ba850da · ba850da
1 parent f26b3e2
commit ba850da
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/doomsday/client/src/network/net_main.cpp b/doomsday/client/src/network/net_main.cpp
@@ -1353,25 +1353,24 @@ D_CMD(Net)
         {
             success = N_LookForHosts(argv[2], 0, 0);
         }
-        /*
         else if(!stricmp(argv[1], "connect"))
         {
-            int             idx;
+            int idx;
 
             if(netGame)
             {
                 Con_Printf("Already connected.\n");
                 return false;
             }
 
-            idx = strtol(argv[2], NULL, 10);
+            idx = strtol(argv[2], NULL, 10); // ignored!
             CmdReturnValue = success = N_Connect();
 
             if(success)
             {
                 Con_Message("Connected.\n");
             }
-        }*/
+        }
         else if(!stricmp(argv[1], "mconnect"))
         {
             serverinfo_t    info;

diff --git a/doomsday/libgui/src/guiapp.cpp b/doomsday/libgui/src/guiapp.cpp
@@ -31,7 +31,7 @@ DENG2_PIMPL(GuiApp)
     bool loopRunning;
 
     Instance(Public *i)
-        : Base(*i),
+        : Base(i),
           refreshInterval(0),
           loopRunning(false)
     {}

diff --git a/doomsday/server/src/main_server.cpp b/doomsday/server/src/main_server.cpp
@@ -61,22 +61,27 @@ int main(int argc, char** argv)
     de::App *dengApp = &textApp;
     novideo = true;
 
-    dengApp->setTerminateFunc(handleLegacyCoreTerminate);
+    // Override the system locale (affects number/time formatting).
+    QLocale::setDefault(QLocale("en_US.UTF-8"));
 
-    try
-    {
-        // Override the system locale (affects number/time formatting).
-        QLocale::setDefault(QLocale("en_US.UTF-8"));
+    // Use the host system's proxy configuration.
+    QNetworkProxyFactory::setUseSystemConfiguration(true);
+
+    // Metadata.
+    QCoreApplication::setOrganizationDomain ("dengine.net");
+    QCoreApplication::setOrganizationName   ("Deng Team");
+    QCoreApplication::setApplicationName    ("Doomsday Server");
+    QCoreApplication::setApplicationVersion (DOOMSDAY_VERSION_BASE);
 
-        // Use the host system's proxy configuration.
-        QNetworkProxyFactory::setUseSystemConfiguration(true);
+    dengApp->setTerminateFunc(handleLegacyCoreTerminate);
 
-        // Metadata.
-        QCoreApplication::setOrganizationDomain ("dengine.net");
-        QCoreApplication::setOrganizationName   ("Deng Team");
-        QCoreApplication::setApplicationName    ("Doomsday Server");
-        QCoreApplication::setApplicationVersion (DOOMSDAY_VERSION_BASE);
+    /// @todo After LegacyNetwork is gone, ServerSystem can be a regular variable.
+    QScopedPointer<ServerSystem> sv(new ServerSystem);
+    dengApp->addSystem(*sv);
 
+    // Initialization.
+    try
+    {
         // C interface to the app.
         de2LegacyCore = LegacyCore_New();
 
@@ -88,9 +93,6 @@ int main(int argc, char** argv)
 
         dengApp->initSubsystems();
 
-        ServerSystem sv;
-        dengApp->addSystem(sv);
-
         Libdeng_Init();
 
         // Initialize.
@@ -113,6 +115,8 @@ int main(int argc, char** argv)
     // Cleanup.
     Sys_Shutdown();
     DD_Shutdown();
+    dengApp->removeSystem(*sv);
+    delete sv.take();
     LegacyCore_Delete(de2LegacyCore);
 
     return result;