Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-12-03 00:16:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix error when exiting in win32

Browse Source
This commit is contained in:
Eduardo Bart
2012-06-20 02:41:00 -03:00
parent 8761220deb
commit eb457bf9cd
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/framework/application.cpp
View File

@@ -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];

2
src/framework/application.h
View File

@@ -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();

6
src/framework/platform/win32window.cpp
View File

@@ -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,