summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2008-07-03 16:13:57 +0000
committerDavid Athay <ko2fan@gmail.com>2008-07-03 16:13:57 +0000
commitd22c6843a9b9f06a0f9e05bed268bfab90b75031 (patch)
tree8a8c8068977f733ded36b9f12f274395401cfcc2 /src
parent68b7cdb813c937373a840a55844d42626be4763b (diff)
downloadmana-client-d22c6843a9b9f06a0f9e05bed268bfab90b75031.tar.gz
mana-client-d22c6843a9b9f06a0f9e05bed268bfab90b75031.tar.bz2
mana-client-d22c6843a9b9f06a0f9e05bed268bfab90b75031.tar.xz
mana-client-d22c6843a9b9f06a0f9e05bed268bfab90b75031.zip
Fix guild window focus and crash bug
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp4
-rw-r--r--src/gui/window.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 789a13f6..6b73b8ca 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -532,10 +532,10 @@ void Game::handleInput()
{
setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
}
- else if (guildWindow->isVisible())
+/* else if (guildWindow->isVisible())
{
// TODO: Check if a dialog is open and close it if so
- }
+ }*/
// Else, open the chat edit box
else
{
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 1e5dff50..24c9f850 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -169,9 +169,9 @@ Window::~Window()
// Clean up Border images.
for( int i = 0; i < 9; i++ )
{
+ delete border[i];
border[i] = NULL;
}
- delete border;
}
void Window::setWindowContainer(WindowContainer *wc)