From eb019ab915998a3ec247b33dad4b23f763d7a29a Mon Sep 17 00:00:00 2001
From: Dennis Friis <peavey@placid.dk>
Date: Mon, 9 Jun 2008 15:03:14 +0000
Subject: Fix for segfault in drop down list of player ignore and sanity check
 for /whisper ignore. Patch by fate.

---
 src/gui/setup_players.cpp |  7 ++++++-
 src/gui/table.cpp         |  5 ++++-
 src/player_relations.cpp  | 10 +++++++---
 3 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index ae0e7271..20a225b8 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -320,7 +320,12 @@ Setup_Players::action(const gcn::ActionEvent &event)
         player_relations.addListener(this);
 
     } else if (event.getId() == ACTION_DELETE) {
-        std::string name = mPlayerTableModel->getPlayerAt(mPlayerTable->getSelectedRow());
+        int player_index = mPlayerTable->getSelectedRow();
+
+        if (player_index < 0)
+            return;
+
+        std::string name = mPlayerTableModel->getPlayerAt(player_index);
 
         player_relations.removePlayer(name);
 
diff --git a/src/gui/table.cpp b/src/gui/table.cpp
index 07f40f76..89a93825 100644
--- a/src/gui/table.cpp
+++ b/src/gui/table.cpp
@@ -109,6 +109,7 @@ GuiTable::setModel(TableModel *new_model)
     recomputeDimensions();
 }
 
+
 void
 GuiTable::recomputeDimensions(void)
 {
@@ -347,8 +348,10 @@ GuiTable::modelUpdated(bool completed)
     if (completed) {
         recomputeDimensions();
         installActionListeners();
-    } else // before the update?
+    } else { // before the update?
+        mTopWidget = NULL; // No longer valid in general
         uninstallActionListeners();
+    }
 }
 
 gcn::Widget *
diff --git a/src/player_relations.cpp b/src/player_relations.cpp
index 86e0861e..f7e04712 100644
--- a/src/player_relations.cpp
+++ b/src/player_relations.cpp
@@ -211,9 +211,13 @@ PlayerRelationsManager::hasPermission(const std::string &name, unsigned int flag
 
     if (!permitted) {
         // execute `ignore' strategy, if possible
-        if (mIgnoreStrategy)
-            mIgnoreStrategy->ignore(dynamic_cast<Player *>(beingManager->findBeingByName(name, Being::PLAYER)),
-                                    rejections);
+        if (mIgnoreStrategy) {
+            Player *to_ignore = dynamic_cast<Player *>(beingManager->findBeingByName(name, Being::PLAYER));
+
+            if (to_ignore)
+                mIgnoreStrategy->ignore(to_ignore,
+                                        rejections);
+        }
     }
 
     return permitted;
-- 
cgit v1.2.3-70-g09d2