2 files changed, 12 insertions, 2 deletions

diff --git a/pacman-c++/server/server.cpp b/pacman-c++/server/server.cpp
index c9e4fff..65db87d 100644
--- a/pacman-c++/server/server.cpp
+++ b/pacman-c++/server/server.cpp
@@ -38,7 +38,7 @@ Server::~Server()
         break;
       case ENET_EVENT_TYPE_DISCONNECT:
         m_clientConnections.remove(event.peer);
-        return;
+        break;
       default:
         break;
       }
@@ -949,6 +949,12 @@ int main(int argc, char **argv)
    */
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
+  if (enet_initialize () != 0)
+  {
+    qCritical() << "An error occurred while initializing ENet";
+    return EXIT_FAILURE;
+  }
+
   QApplication app(argc, argv, false);
   app.setApplicationName("Pacman Server");
   app.setWindowIcon(QIcon(":/appicon"));
@@ -964,6 +970,8 @@ int main(int argc, char **argv)
   if (!ret)
     ret = app.exec();
 
+  enet_deinitialize();
+
   /* Delete all global objects allocated by libprotobuf */
   google::protobuf::ShutdownProtobufLibrary();
 
diff --git a/pacman-c++/server/server.pro b/pacman-c++/server/server.pro
index 05d5c9d..b5a9952 100644
--- a/pacman-c++/server/server.pro
+++ b/pacman-c++/server/server.pro
@@ -7,4 +7,6 @@ HEADERS += anyoption.h \
     server.h
 
 include(../common.pri)
-PRE_TARGETDEPS += ../common/libcommon.a
+PRE_TARGETDEPS += ../libcommon.a
+
+win32:RC_FILE = ../common/pacman.rc