From 4bdd1e79fd987166d25ea0d8f367fe4303cb6a09 Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Wed, 13 Mar 2013 21:18:17 -0300 Subject: [PATCH] Fix compile error for win32 --- modules/game_interface/gameinterface.lua | 8 +++++++- src/framework/platform/win32platform.cpp | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/game_interface/gameinterface.lua b/modules/game_interface/gameinterface.lua index 2272abe5..f8a851ed 100644 --- a/modules/game_interface/gameinterface.lua +++ b/modules/game_interface/gameinterface.lua @@ -241,9 +241,13 @@ function tryLogout() if not g_game.isConnectionOk() then local yesCallback = function() g_game.forceLogout() - logoutWindow=nil + if logoutWindow then + logoutWindow:destroy() + logoutWindow=nil + end end local noCallback = function() + logoutWindow:destroy() logoutWindow=nil end @@ -254,9 +258,11 @@ function tryLogout() else local yesCallback = function() g_game.safeLogout() + logoutWindow:destroy() logoutWindow=nil end local noCallback = function() + logoutWindow:destroy() logoutWindow=nil end diff --git a/src/framework/platform/win32platform.cpp b/src/framework/platform/win32platform.cpp index 849c260d..9096cedd 100644 --- a/src/framework/platform/win32platform.cpp +++ b/src/framework/platform/win32platform.cpp @@ -415,7 +415,7 @@ std::string Platform::getOSName() } -std::string Platform::traceback(const std::string& where) +std::string Platform::traceback(const std::string& where, int level, int maxDepth) { std::stringstream ss; ss << "\nat:";