From eb457bf9cd9a3d8be46089e64dc143f298e76270 Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Wed, 20 Jun 2012 02:41:00 -0300
Subject: [PATCH] Fix error when exiting in win32

---
 src/framework/application.cpp          | 4 +++-
 src/framework/application.h            | 2 +-
 src/framework/platform/win32window.cpp | 6 +++---
 src/main.cpp                           | 4 ++--
 src/otclient/core/game.h               | 6 +-----
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/framework/application.cpp b/src/framework/application.cpp
index 625b7470..52ff51d9 100644
--- a/src/framework/application.cpp
+++ b/src/framework/application.cpp
@@ -61,7 +61,7 @@ Application::Application()
     m_foregroundFrameCounter.setMaxFps(60);
 }
 
-void Application::init(const std::vector<std::string>& args)
+void Application::init(const std::string& compactName, const std::vector<std::string>& args)
 {
     // capture exit signals
     signal(SIGTERM, exitSignalHandler);
@@ -71,6 +71,8 @@ void Application::init(const std::vector<std::string>& args)
     installCrashHandler();
 #endif
 
+    m_appCompactName = compactName;
+
     std::string startupOptions;
     for(uint i=1;i<args.size();++i) {
         const std::string& arg = args[i];
diff --git a/src/framework/application.h b/src/framework/application.h
index da074eca..2c158bf2 100644
--- a/src/framework/application.h
+++ b/src/framework/application.h
@@ -36,7 +36,7 @@ class Application
 public:
     Application();
 
-    void init(const std::vector<std::string>& args);
+    void init(const std::string& compactName, const std::vector<std::string>& args);
     void deinit();
     void terminate();
     void run();
diff --git a/src/framework/platform/win32window.cpp b/src/framework/platform/win32window.cpp
index 75f725e6..cf1144cb 100644
--- a/src/framework/platform/win32window.cpp
+++ b/src/framework/platform/win32window.cpp
@@ -230,7 +230,7 @@ void WIN32Window::terminate()
     }
 
     if(m_instance) {
-        if(!UnregisterClassA(g_app.getName().c_str(), m_instance))
+        if(!UnregisterClassA(g_app.getCompactName().c_str(), m_instance))
             g_logger.error("UnregisterClassA failed");
         m_instance = NULL;
     }
@@ -256,7 +256,7 @@ void WIN32Window::internalCreateWindow()
     wc.hCursor          = m_defaultCursor;
     wc.hbrBackground    = (HBRUSH)GetStockObject(WHITE_BRUSH);
     wc.lpszMenuName     = NULL;
-    wc.lpszClassName    = g_app.getName().c_str();
+    wc.lpszClassName    = g_app.getCompactName().c_str();
 
     if(!RegisterClassA(&wc))
         g_logger.fatal("Failed to register the window class.");
@@ -272,7 +272,7 @@ void WIN32Window::internalCreateWindow()
 
     updateUnmaximizedCoords();
     m_window = CreateWindowExA(dwExStyle,
-                               g_app.getName().c_str(),
+                               g_app.getCompactName().c_str(),
                                NULL,
                                dwStyle,
                                windowRect.left,
diff --git a/src/main.cpp b/src/main.cpp
index cdfa50f8..7bd4851e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,11 +30,11 @@ int main(int argc, const char* argv[])
     std::vector<std::string> args(argv, argv + argc);
 
     // initialize application framework and otclient
-    g_app.init(args);
+    g_app.init("otclient", args);
     g_otclient.init(args);
 
     // find script init.lua and run it
-    g_resources.discoverWorkDir("otclient", "init.lua");
+    g_resources.discoverWorkDir(g_app.getCompactName(), "init.lua");
     if(!g_lua.safeRunScript(g_resources.getWorkDir() + "init.lua"))
         g_logger.fatal("Unable to run script init.lua!");
 
diff --git a/src/otclient/core/game.h b/src/otclient/core/game.h
index e5c6a2d8..1b399179 100644
--- a/src/otclient/core/game.h
+++ b/src/otclient/core/game.h
@@ -117,11 +117,7 @@ protected:
 
 public:
     // login related
-    void loginWorld(const std::string& account,
-                        const std::string& password,
-                        const std::string& worldName,
-                    const std::string& worldHost, int worldPort,
-                    const std::string& characterName);
+    void loginWorld(const std::string& account, const std::string& password, const std::string& worldName, const std::string& worldHost, int worldPort, const std::string& characterName);
     void cancelLogin();
     void forceLogout();
     void safeLogout();