2 files changed, 6 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 2eeb0c11..0693d1c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ Makefile
 config.h
 config.log
 config.status
+config.status.lineno
 po/POTFILES
 .deps
 stamp-h1
diff --git a/src/player.cpp b/src/player.cpp
index ec3b1c1c..5ab94595 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -144,6 +144,11 @@ void Player::setSprite(int slot, int id, std::string color)
     {
         delete mSprites[slot];
         mSprites[slot] = NULL;
+
+        if (slot == WEAPON_SPRITE)
+        {
+            mEquippedWeapon = NULL;
+        }
     }
     else
     {