about summary refs log tree commit diff
path: root/src/game/client/game_client.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/client/game_client.cpp')
-rw-r--r--src/game/client/game_client.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp
index 0e2e439d..5bb166ff 100644
--- a/src/game/client/game_client.cpp
+++ b/src/game/client/game_client.cpp
@@ -1720,7 +1720,7 @@ void render_game()
 		gfx_quads_begin();
 		
 		// render cursor
-		if (!menu_active)
+		if (!menu_active && (!emoticon_selector_active || emoticon_selector_inactive_override))
 		{
 			select_sprite(data->weapons[local_player->weapon%data->num_weapons].sprite_cursor);
 			float cursorsize = 64;