1 files changed, 17 insertions, 5 deletions
diff --git a/src/Client/CommandParser.h b/src/Client/CommandParser.h
index 660f548..e08c775 100644
--- a/src/Client/CommandParser.h
+++ b/src/Client/CommandParser.h
@@ -49,7 +49,7 @@ class CommandParser {
 
     static const Command commands[];
 
-    CommandManager commandManager;
+    static CommandParser commandParser;
 
     Net::Connection *connection;
 
@@ -68,13 +68,25 @@ class CommandParser {
     void statusCommand(const std::vector<std::string> &args);
     void exitCommand(const std::vector<std::string>&);
 
+    CommandParser() : connection(0) {}
+
   public:
-    CommandParser(Net::Connection *connection0) : connection(connection0) {}
+    static CommandParser *getCommandParser() {
+      return &commandParser;
+    }
+
+    Net::Connection *getConnection() const {
+      return connection;
+    }
+
+    void setConnection(Net::Connection *con) {
+      connection = con;
+    }
 
-    bool requestsActive() {return commandManager.requestsActive();}
-    bool willDisconnect() {return commandManager.willDisconnect();}
+    bool requestsActive() {return CommandManager::getCommandManager()->requestsActive();}
+    bool willDisconnect() {return CommandManager::getCommandManager()->willDisconnect();}
 
-    sigc::signal<void> signalFinished() const {return commandManager.signalFinished();}
+    sigc::signal<void> signalFinished() const {return CommandManager::getCommandManager()->signalFinished();}
 
     bool parse(const std::string &cmd);