bugfix

3 files changed, 5 insertions, 3 deletions

diff --git a/src/client/chat.cc b/src/client/chat.cc
index 1983415..93ba4b0 100644
--- a/src/client/chat.cc
+++ b/src/client/chat.cc
@@ -165,8 +165,10 @@ void Chat::event_draw()
 		return;
 	}
 
-	if (ui::root()->active())
+	if (ui::root()->active()) {
+		hide();
 		return;
+	}
 	
 	if (chat_small) {
 		chat_scrollpane->hide();
diff --git a/src/client/video.cc b/src/client/video.cc
index c861282..a8e5400 100644
--- a/src/client/video.cc
+++ b/src/client/video.cc
@@ -317,6 +317,7 @@ void draw_loader()
 
 	gl::disable(GL_BLEND);
 	
+	is_loading = true;
 }
 
 void frame_loader()
@@ -326,7 +327,6 @@ void frame_loader()
 	
 	draw_loader();
 	
-	is_loading = true;
 	SDL_GL_SwapBuffers();
 }
 
diff --git a/src/client/video.h b/src/client/video.h
index 3ba3ad2..978a876 100644
--- a/src/client/video.h
+++ b/src/client/video.h
@@ -39,7 +39,7 @@ namespace video
 	void set_loader_message(const std::string message);
 	
 	/// update the loader screen message
-	void set_loader_message(const char *message);
+	void set_loader_message(const char *message = 0);
 
 	/// set the window caption
 	void set_caption();