From d813da0afb4ebeea2c25dbdae36060eee5424d45 Mon Sep 17 00:00:00 2001
From: j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Mon, 1 Jun 2009 15:34:21 +0000
Subject: Apply r9873 to trunk.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9874 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/describe.cc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'crawl-ref/source/describe.cc')

diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 9437a4c4c8..796b75b7e1 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -34,6 +34,7 @@ REVISION("$Rev$");
 #include "it_use2.h"
 #include "itemname.h"
 #include "itemprop.h"
+#include "items.h"
 #include "macro.h"
 #include "mapmark.h"
 #include "menu.h"
@@ -2285,6 +2286,9 @@ static bool _describe_spells(const item_def &item)
 //---------------------------------------------------------------
 void describe_item( item_def &item, bool allow_inscribe )
 {
+    if (!is_valid_item(item))
+        return;
+
     while (true)
     {
         const bool spells_shown = _show_item_description(item);
-- 
cgit v1.2.3-54-g00ecf